Run autopep8 in agressive 1 mode

Author: Flamefire

easybuild/tools/configobj.py

@@ -1603,7 +1603,7 @@ def _parse(self, infile):
                             try:
                                 value = unrepr(value)
                             except Exception as e:
-                                if type(e) == UnknownType:
+                                if isinstance(e, UnknownType):
                                     msg = 'Unknown name or type in value at line %s.'
                                 else:
                                     msg = 'Parse error in value at line %s.'

easybuild/tools/containers/utils.py

@@ -78,7 +78,7 @@ def check_tool(tool_name, min_tool_version=None):
     out, ec = run_cmd(version_cmd, simple=False, trace=False, force_in_dry_run=True)
     if ec:
         raise EasyBuildError("Error running '{0}' for tool {1} with output: {2}".format(version_cmd, tool_name, out))
-    res = re.search("\d+\.\d+(\.\d+)?", out.strip())
+    res = re.search(r"\d+\.\d+(\.\d+)?", out.strip())
     if not res:
         raise EasyBuildError("Error parsing version for tool {0}".format(tool_name))
     tool_version = res.group(0)

easybuild/tools/docs.py

@@ -522,7 +522,7 @@ def list_software(output_format=FORMAT_TXT, detailed=False, only_installed=False
 
         ecs.append(ec)
         print_msg('\r', prefix=False, newline=False, silent=silent)
-        print_msg("Processed %d/%d easyconfigs..." % (idx+1, cnt), newline=False, silent=silent)
+        print_msg("Processed %d/%d easyconfigs..." % (idx + 1, cnt), newline=False, silent=silent)
     print_msg('', prefix=False, silent=silent)
 
     software = {}
@@ -902,7 +902,7 @@ def gen_easyblock_doc_section_rst(eb_class, path_to_examples, common_params, doc
         '.. _' + classname + ':',
         '',
         '``' + classname + '``',
-        '=' * (len(classname)+4),
+        '=' * (len(classname) + 4),
         '',
     ]
 
@@ -967,7 +967,7 @@ def gen_easyblock_doc_section_rst(eb_class, path_to_examples, common_params, doc
     if os.path.exists(os.path.join(path_to_examples, '%s.eb' % classname)):
         title = 'Example easyconfig for ``' + classname + '`` easyblock'
         doc.extend([title, '-' * len(title), '', '.. code::', ''])
-        for line in read_file(os.path.join(path_to_examples, classname+'.eb')).split('\n'):
+        for line in read_file(os.path.join(path_to_examples, classname + '.eb')).split('\n'):
             doc.append(INDENT_4SPACES + line)
         doc.append('')  # empty line after literal block
 

easybuild/tools/github.py

@@ -1010,7 +1010,7 @@ def find_software_name_for_patch(patch_name, ec_dirs):
                     break
         except EasyBuildError as err:
             _log.debug("Ignoring easyconfig %s that fails to parse: %s", path, err)
-        sys.stdout.write('\r%s of %s easyconfigs checked' % (idx+1, nr_of_ecs))
+        sys.stdout.write('\r%s of %s easyconfigs checked' % (idx + 1, nr_of_ecs))
         sys.stdout.flush()
 
     sys.stdout.write('\n')

easybuild/tools/include.py

@@ -143,7 +143,7 @@ def verify_imports(pymods, pypkg, from_path):
 
 def is_software_specific_easyblock(module):
     """Determine whether Python module at specified location is a software-specific easyblock."""
-    return bool(re.search('^class EB_.*\(.*\):\s*$', read_file(module), re.M))
+    return bool(re.search(r'^class EB_.*\(.*\):\s*$', read_file(module), re.M))
 
 
 def include_easyblocks(tmpdir, paths):

easybuild/tools/job/pbs_python.py

@@ -454,7 +454,7 @@ def info(self, types=None):
             return None
 
         # convert single type into list
-        if type(types) is str:
+        if isinstance(types, str):
             types = [types]
 
         self.log.debug("Return info types %s" % types)

easybuild/tools/module_generator.py

@@ -736,7 +736,7 @@ def get_description(self, conflict=True):
         """
         txt = '\n'.join([
             "proc ModulesHelp { } {",
-            "    puts stderr {%s" % re.sub('([{}\[\]])', r'\\\1', self._generate_help_text()),
+            "    puts stderr {%s" % re.sub(r'([{}\[\]])', r'\\\1', self._generate_help_text()),
             "    }",
             '}',
             '',

easybuild/tools/module_naming_scheme/categorized_mns.py

@@ -56,7 +56,7 @@ def is_short_modname_for(self, short_modname, name):
         Default implementation checks via a strict regex pattern, and assumes short module names are of the form:
         <name>/<version>[-<toolchain>]
         """
-        modname_regex = re.compile('^[^/]+/%s/\S+$' % re.escape(name))
+        modname_regex = re.compile(r'^[^/]+/%s/\S+$' % re.escape(name))
         res = bool(modname_regex.match(short_modname))
 
         tup = (short_modname, name, modname_regex.pattern, res)

easybuild/tools/module_naming_scheme/mns.py

@@ -162,7 +162,7 @@ def is_short_modname_for(self, short_modname, name):
         Default implementation checks via a strict regex pattern, and assumes short module names are of the form:
             <name>/<version>[-<toolchain>]
         """
-        modname_regex = re.compile('^%s(/\S+)?$' % re.escape(name))
+        modname_regex = re.compile(r'^%s(/\S+)?$' % re.escape(name))
         res = bool(modname_regex.match(short_modname))
 
         self.log.debug("Checking whether '%s' is a module name for software with name '%s' via regex %s: %s",

easybuild/tools/modules.py

@@ -444,9 +444,9 @@ def check_module_path(self):
             idx = 1
             while(curr_mod_paths[-idx:] == self.mod_paths[-idx:]):
                 idx += 1
-            self.log.debug("Not prepending %d last entries of %s", idx-1, self.mod_paths)
+            self.log.debug("Not prepending %d last entries of %s", idx - 1, self.mod_paths)
 
-            for mod_path in self.mod_paths[::-1][idx-1:]:
+            for mod_path in self.mod_paths[::-1][idx - 1:]:
                 self.prepend_module_path(mod_path)
 
             self.log.info("$MODULEPATH set via list of module paths (w/ 'module use'): %s" % os.environ['MODULEPATH'])
@@ -1081,7 +1081,7 @@ def path_to_top_of_module_tree(self, top_paths, mod_name, full_mod_subdir, deps,
             if path_matches(full_mod_subdir, full_modpath_exts):
 
                 # full path to module subdir of dependency is simply path to module file without (short) module name
-                dep_full_mod_subdir = self.modulefile_path(dep, strip_ext=True)[:-len(dep)-1]
+                dep_full_mod_subdir = self.modulefile_path(dep, strip_ext=True)[:-len(dep) - 1]
                 full_mod_subdirs.append(dep_full_mod_subdir)
 
                 mods_to_top.append(dep)
@@ -1622,7 +1622,7 @@ def __init__(self, *args, **kwargs):
 
     def exist(self, mod_names, *args, **kwargs):
         """No modules, so nothing exists"""
-        return [False]*len(mod_names)
+        return [False] * len(mod_names)
 
     def check_loaded_modules(self):
         """Nothing to do since no modules"""