Manually fix remaining flake8 failures in easybuild/tools

Author: Flamefire

easybuild/tools/configobj.py

@@ -319,7 +319,7 @@ def __init__(self, section):
 
     def interpolate(self, key, value):
         # short-cut
-        if not self._cookie in value:
+        if self._cookie not in value:
             return value
 
         def recursive_interpolate(key, value, section, backtrail):
@@ -543,7 +543,7 @@ def _interpolate(self, key, value):
         except AttributeError:
             # not yet: first time running _interpolate(), so pick the engine
             name = self.main.interpolation
-            if name == True:  # note that "if name:" would be incorrect here
+            if name is True:  # note that "if name:" would be incorrect here
                 # backwards-compatibility: interpolation=True means use default
                 name = DEFAULT_INTERPOLATION
             name = name.lower()  # so that "Template", "template", etc. all work
@@ -942,10 +942,8 @@ def as_bool(self, key):
         0
         """
         val = self[key]
-        if val == True:
-            return True
-        elif val == False:
-            return False
+        if val is True or val is False:
+            return val
         else:
             try:
                 if not isinstance(val, string_type):
@@ -1466,7 +1464,7 @@ def _decode(self, infile, encoding):
             # NOTE: Could raise a ``UnicodeDecodeError``
             return infile.decode(encoding).splitlines(True)
         for i, line in enumerate(infile):
-            if not isinstance(line, unicode):
+            if isinstance(line, str):
                 # NOTE: The isinstance test here handles mixed lists of unicode/string
                 # NOTE: But the decode will break on any non-string values
                 # NOTE: Or could raise a ``UnicodeDecodeError``
@@ -2175,7 +2173,7 @@ def validate_entry(entry, spec, val, missing, ret_true, ret_false):
             if entry in ('__many__', '___many___'):
                 # reserved names
                 continue
-            if (not entry in section.scalars) or (entry in section.defaults):
+            if (entry not in section.scalars) or (entry in section.defaults):
                 # missing entries
                 # or entries from defaults
                 missing = True
@@ -2238,9 +2236,9 @@ def validate_entry(entry, spec, val, missing, ret_true, ret_false):
                 section.inline_comments[entry] = configspec.inline_comments.get(entry, '')
             check = self.validate(validator, preserve_errors=preserve_errors, copy=copy, section=section[entry])
             out[entry] = check
-            if check == False:
+            if check is False:
                 ret_true = False
-            elif check == True:
+            elif check is True:
                 ret_false = False
             else:
                 ret_true = False
@@ -2356,15 +2354,15 @@ def flatten_errors(cfg, res, levels=None, results=None):
         # first time called
         levels = []
         results = []
-    if res == True:
+    if res is True:
         return results
-    if res == False or isinstance(res, Exception):
+    if res is False or isinstance(res, Exception):
         results.append((levels[:], None, res))
         if levels:
             levels.pop()
         return results
     for (key, val) in res.items():
-        if val == True:
+        if val is True:
             continue
         if isinstance(cfg.get(key), dict):
             # Go down one level

easybuild/tools/filetools.py

@@ -1843,7 +1843,7 @@ def copytree(src, dst, symlinks=False, ignore=None):
     class Error(EnvironmentError):
         pass
     try:
-        WindowsError  # @UndefinedVariable
+        WindowsError = WindowsError # noqa
     except NameError:
         WindowsError = None
 

easybuild/tools/job/gc3pie.py

@@ -69,7 +69,7 @@ class AbortingDependentTaskCollection(AbortOnError, DependentTaskCollection):
         """
         pass
 
-except ImportError as err:
+except ImportError:
     _log.debug("Failed to import gc3libs from GC3Pie."
                " Silently ignoring, this is a real issue only when GC3Pie is used as backend for --job")
 

easybuild/tools/job/pbs_python.py

@@ -54,7 +54,7 @@
     from PBSQuery import PBSQuery
     KNOWN_HOLD_TYPES = [pbs.USER_HOLD, pbs.OTHER_HOLD, pbs.SYSTEM_HOLD]
 
-except ImportError as err:
+except ImportError:
     _log.debug("Failed to import pbs/PBSQuery from pbs_python."
                " Silently ignoring, this is a real issue only when pbs_python is used as backend for --job")
 
@@ -347,7 +347,8 @@ def _submit(self):
 
         self.log.debug("Going to submit to queue %s" % self.queue)
 
-        # job submission sometimes fails without producing an error, e.g. when one of the dependency jobs has already finished
+        # job submission sometimes fails without producing an error,
+        # e.g. when one of the dependency jobs has already finished
         # when that occurs, None will be returned by pbs_submit as job id
         jobid = pbs.pbs_submit(self.pbsconn, pbs_attributes, scriptfn, self.queue, NULL)
         is_error, errormsg = pbs.error()

easybuild/tools/py2vs3/py2.py

@@ -65,7 +65,7 @@ def subprocess_popen_text(cmd, **kwargs):
 
 def raise_with_traceback(exception_class, message, traceback):
     """Raise exception of specified class with given message and traceback."""
-    raise exception_class, message, traceback
+    raise exception_class, message, traceback  # noqa: E999
 
 
 def extract_method_name(method_func):

easybuild/tools/repository/hgrepo.py

@@ -100,7 +100,7 @@ def create_working_copy(self):
 
         # try to get a copy of
         try:
-            client = hglib.clone(self.repo, self.wc)
+            hglib.clone(self.repo, self.wc)
             self.log.debug("repo %s cloned in %s" % (self.repo, self.wc))
         except (HgCommandError, OSError) as err:
             # it might already have existed

easybuild/tools/variables.py

@@ -225,11 +225,11 @@ def __init__(self, *args, **kwargs):
 
         self.protected_classes = self.PROTECTED_CLASSES[:]
         if self.PROTECT_CLASS_SELF:
-            if not self.DEFAULT_CLASS in self.protected_classes:
+            if self.DEFAULT_CLASS not in self.protected_classes:
                 self.protected_classes.append(self.DEFAULT_CLASS)
         self.protected_instances = self.PROTECTED_INSTANCES[:]
         if self.PROTECT_INSTANCE_SELF:
-            if not self.DEFAULT_CLASS in self.protected_instances:
+            if self.DEFAULT_CLASS not in self.protected_instances:
                 self.protected_instances.append(self.DEFAULT_CLASS)
 
     def append_empty(self):
@@ -291,7 +291,7 @@ def nappend(self, value, **kwargs):
                 newvalue = klass(**kwargs)
                 if value is not None:
                     newvalue.append(value)
-        if not position is None:
+        if position is not None:
             newvalue.POSITION = position
         if self._str_ok(newvalue) or append_empty:
             self.append(newvalue)