Fix singleton comparisons (None, True)

Flamefire · Flamefire · commit 9cfe7d167555 · 2019-05-27T17:34:09.000+02:00
Checks should be done with "is None"/"is not None"
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@ def get_requirements(lookup=None):
     '''get_requirements reads in requirements and versions from
     the lookup obtained with get_lookup'''
 
-    if lookup == None:
+    if lookup is None:
         lookup = get_lookup()
 
     install_requires = []
@@ -43,7 +43,7 @@ def get_requirements(lookup=None):
         if "exact_version" in module_meta:
             dependency = "%s==%s" %(module_name,module_meta['exact_version'])
         elif "min_version" in module_meta:
-            if module_meta['min_version'] == None:
+            if module_meta['min_version'] is None:
                 dependency = module_name
             else:
                 dependency = "%s>=%s" %(module_name,module_meta['min_version'])
diff --git a/spython/instance/__init__.py b/spython/instance/__init__.py
@@ -42,7 +42,7 @@ def generate_name(self, name=None):
            supply one.
         '''
         # If no name provided, use robot name
-        if name == None:
+        if name is None:
             name = self.RobotNamer.generate()
         self.name = name.replace('-','_')
 
@@ -74,7 +74,7 @@ def _update_metadata(self, kwargs=None):
         '''
 
         # If not given metadata, use instance.list to get it for container
-        if kwargs == None and hasattr(self, 'name'):
+        if kwargs is None and hasattr(self, 'name'):
             kwargs = self._list(self.name, quiet=True, return_json=True)
 
         # Add acceptable arguments
diff --git a/spython/instance/cmd/start.py b/spython/instance/cmd/start.py
@@ -30,7 +30,7 @@ def start(self, image=None, name=None, args=None, sudo=False, options=[], captur
     check_install()
 
     # If name provided, over write robot (default)
-    if name != None:
+    if name is not None:
         self.name = name
 
     # If an image isn't provided, we have an initialized instance
@@ -57,7 +57,7 @@ def start(self, image=None, name=None, args=None, sudo=False, options=[], captur
     cmd = cmd + options + [image, self.name]
 
     # If arguments are provided
-    if args != None:
+    if args is not None:
         if not isinstance(args, list):
             args = [args]
         cmd = cmd + args
diff --git a/spython/logger/spinner.py b/spython/logger/spinner.py
@@ -31,7 +31,7 @@ def changing_arrows():
             for cursor in '<^>v': yield cursor
 
     def select_generator(self, generator):
-        if generator == None:
+        if generator is None:
             generator = choice(['cursor',
                                 'arrow',
                                 'balloons'])
diff --git a/spython/main/base/command.py b/spython/main/base/command.py
@@ -125,7 +125,7 @@ def run_command(self, cmd,
 
     '''
     # First preference to function, then to client setting
-    if quiet == None:
+    if quiet is None:
         quiet = self.quiet
 
     result = run_cmd(cmd, sudo=sudo, capture=capture, quiet=quiet)
diff --git a/spython/main/export.py b/spython/main/export.py
@@ -34,7 +34,7 @@ def export(self,
     # If not version 3, run deprecated command
     if 'version 3' in self.version() or '2.6' in self.version():
 
-        if output_file == None:
+        if output_file is None:
             output_file = self._get_filename(image_path, 'sandbox')
 
         return self.build(recipe=image_path,
@@ -79,7 +79,7 @@ def _export(self,
     cmd = self._init_command('export')
     
     # If the user has specified export to pipe, we don't need a file
-    if pipe == True:
+    if pipe:
         cmd.append(image_path)
 
     else:
@@ -94,7 +94,7 @@ def _export(self,
             return None
 
         # if user has specified output file, move it there, return path
-        if output_file != None:
+        if output_file is not None:
             shutil.copyfile(tmptar, output_file)
             return output_file
         else:
diff --git a/spython/main/help.py b/spython/main/help.py
@@ -18,7 +18,7 @@ def help(self, command=None):
     check_install()
 
     cmd = ['singularity','--help']
-    if command != None:
+    if command is not None:
         cmd.append(command)
     help = self._run_command(cmd)
     return help
diff --git a/spython/main/instances.py b/spython/main/instances.py
@@ -66,7 +66,7 @@ def instances(self, name=None, return_json=False, quiet=False):
             for i in instances:
                 
                 # If the user has provided a name, only add instance matches
-                if name != None:
+                if name is not None:
                     if name != i['daemon_name']:
                         continue
 
@@ -89,7 +89,7 @@ def instances(self, name=None, return_json=False, quiet=False):
         bot.info('No instances found.')
 
     # If we are given a name, return just one
-    if name != None and instances not in [None,[]]:
+    if name is not None and instances not in [None,[]]:
         if len(instances) == 1:
             instances = instances[0]
 
diff --git a/spython/oci/__init__.py b/spython/oci/__init__.py
@@ -38,7 +38,7 @@ def __init__(self,
         self.sudo = sudo
 
         # If bundle is provided, create it
-        if bundle != None and container_id != None and create:
+        if bundle is not None and container_id is not None and create:
             self.bundle = bundle
             self.create(bundle, container_id, **kwargs)
 
@@ -56,7 +56,7 @@ def get_container_id(self, container_id=None):
         '''
 
         # The user must provide a container_id, or have one with the client
-        if container_id == None and self.container_id == None:
+        if container_id is None and self.container_id is None:
             bot.exit('You must provide a container_id.')
 
         # Choose whichever is not None, with preference for function provided
@@ -72,7 +72,7 @@ def get_uri(self):
 # Naming
 
     def __str__(self):
-        if self.container_id != None:
+        if self.container_id is not None:
             return "[singularity-python-oci:%s]" % self.container_id
         return "[singularity-python-oci]"
 
@@ -92,7 +92,7 @@ def _get_sudo(self, sudo=None):
            ==========
            sudo: if None, use self.sudo. Otherwise return sudo.
         '''
-        if sudo == None:
+        if sudo is None:
             sudo = self.sudo
         return sudo
 
diff --git a/spython/oci/cmd/actions.py b/spython/oci/cmd/actions.py
@@ -119,11 +119,11 @@ def _run(self, bundle,
     # Additional Logging Files
     cmd = cmd + ['--log-format', log_format]
 
-    if log_path != None:
+    if log_path is not None:
         cmd = cmd + ['--log-path', log_path]
-    if pid_file != None:
+    if pid_file is not None:
         cmd = cmd + ['--pid-file', pid_file]
-    if sync_socket != None:
+    if sync_socket is not None:
         cmd = cmd + ['--sync-socket', sync_socket]
     if empty_process:
         cmd.append('--empty-process')
@@ -225,7 +225,7 @@ def execute(self, command=None, container_id=None, sudo=False, stream=False):
     # Add the container_id
     cmd.append(container_id)
 
-    if command != None:
+    if command is not None:
         if not isinstance(command, list):
             command = [command]
 
@@ -255,7 +255,7 @@ def update(self, container_id, from_file=None):
     # singularity oci delete
     cmd = self._init_command('update')
 
-    if from_file != None:
+    if from_file is not None:
         cmd = cmd + ['--from-file', from_file]
 
     # Add the container_id
diff --git a/spython/oci/cmd/states.py b/spython/oci/cmd/states.py
@@ -35,7 +35,7 @@ def state(self, container_id=None, sudo=None, sync_socket=None):
     # singularity oci state
     cmd = self._init_command('state')
 
-    if sync_socket != None:
+    if sync_socket is not None:
         cmd = cmd + ['--sync-socket', sync_socket]
 
     # Finally, add the container_id
@@ -44,7 +44,7 @@ def state(self, container_id=None, sudo=None, sync_socket=None):
     # Get the instance state
     result = self._run_command(cmd, sudo=sudo, quiet=True)
 
-    if result != None:
+    if result is not None:
 
         # If successful, a string is returned to parse
         if isinstance(result, str):
@@ -133,7 +133,7 @@ def kill(self, container_id=None, sudo=None, signal=None):
     cmd.append(container_id)
 
     # Add the signal, if defined
-    if signal != None:
+    if signal is not None:
         cmd = cmd + ['--signal', signal]
 
     # Run the command, return return code
