@@ -87,8 +87,8 @@ async def get_image(
8787 if extra is None :
8888 extra = {}
8989
90- if extra .get ("dir" ) == None :
91- if self .dir == None :
90+ if extra .get ("dir" ) is None :
91+ if self .dir is None :
9292 raise ViamError (
9393 "'dir' must be passed in with 'extra', specifying image directory relative to the configured 'root_dir'"
9494 )
@@ -100,23 +100,23 @@ async def get_image(
100100 raise ViamError ("requested 'dir' not found within configured 'root_dir'" )
101101
102102 image_index : int
103- if extra .get ("index" ) != None :
103+ if extra .get ("index" ) is not None :
104104 image_index = extra ["index" ]
105105
106- if extra .get ("index_reset" ) != None :
107- if extra ["index_reset" ] == True :
106+ if extra .get ("index_reset" ) is not None :
107+ if extra ["index_reset" ]:
108108 # reset
109109 image_index = self ._get_oldest_image_index (requested_dir )
110110
111- if extra .get ("index_jog" ) != None :
111+ if extra .get ("index_jog" ) is not None :
112112 image_index = self ._jog_index (extra ["index_jog" ], requested_dir )
113- elif self .directory_index .get (requested_dir ) != None :
113+ elif self .directory_index .get (requested_dir ) is not None :
114114 image_index = self .directory_index [requested_dir ]
115115 else :
116116 image_index = self ._get_oldest_image_index (requested_dir )
117117
118118 ext = self .ext
119- if extra .get ("ext" ) != None :
119+ if extra .get ("ext" ) is not None :
120120 if extra ["ext" ] in ["jpg" , "jpeg" , "png" , "gif" ]:
121121 ext = extra ["ext" ]
122122
@@ -273,23 +273,23 @@ async def do_command(
273273 self , command : Mapping [str , ValueTypes ], * , timeout : Optional [float ] = None , ** kwargs
274274 ) -> Mapping [str , ValueTypes ]:
275275 ret = {}
276- if command .get ("set" ) != None :
276+ if command .get ("set" ) is not None :
277277 setDict = command .get ("set" )
278- if setDict .get ("dir" ) != None :
278+ if setDict .get ("dir" ) is not None :
279279 self .dir = setDict .get ("dir" )
280280 requested_dir = os .path .join (self .root_dir , self .dir )
281- if setDict .get ("ext" ) != None :
281+ if setDict .get ("ext" ) is not None :
282282 self .ext = setDict .get ("ext" )
283- if setDict .get ("index" ) != None :
283+ if setDict .get ("index" ) is not None :
284284 if isinstance (setDict ["index" ], int ):
285285 self .directory_index [requested_dir ] = setDict ["index" ]
286- if setDict .get ("index_reset" ) != None :
287- if setDict ["index_reset" ] == True :
286+ if setDict .get ("index_reset" ) is not None :
287+ if setDict ["index_reset" ]:
288288 # reset
289289 index = self ._get_oldest_image_index (requested_dir )
290290 self .directory_index [requested_dir ] = index
291291 ret = {"index" : index }
292- if setDict .get ("index_jog" ) != None :
292+ if setDict .get ("index_jog" ) is not None :
293293 index = self ._jog_index (setDict ["index_jog" ], requested_dir )
294294 self .directory_index [requested_dir ] = index
295295 ret = {"index" : index }
0 commit comments