Replace Python2-style super-class

The argument is not required in Python3 avoiding C&P mistakes

Author: Flamefire

easybuild/base/exceptions.py

@@ -125,4 +125,4 @@ def __init__(self, msg, *args, **kwargs):
 
         getattr(logger, self.LOGGING_METHOD_NAME)(msg)
 
-        super(LoggedException, self).__init__(msg)
+        super().__init__(msg)

easybuild/base/frozendict.py

@@ -87,13 +87,13 @@ def __init__(self, *args, **kwargs):
                 msg = "Encountered unknown keys %s (known keys: %s)" % (unknown_keys, self.KNOWN_KEYS)
                 self.log.raiseException(msg, exception=KeyError)
 
-        super(FrozenDictKnownKeys, self).__init__(tmpdict)
+        super().__init__(tmpdict)
 
     # pylint: disable=arguments-differ
     def __getitem__(self, key, *args, **kwargs):
         """Redefine __getitem__ to provide a better KeyError message."""
         try:
-            return super(FrozenDictKnownKeys, self).__getitem__(key, *args, **kwargs)
+            return super().__getitem__(key, *args, **kwargs)
         except KeyError as err:
             if key in self.KNOWN_KEYS:
                 raise KeyError(err)

easybuild/base/generaloption.py

@@ -1745,7 +1745,7 @@ def __init__(self, go_dict=None, short_groupdescr=None, long_groupdescr=None, co
         if config_files is not None:
             kwargs['go_configfiles'] = config_files
 
-        super(SimpleOption, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def main_options(self):
         if self.go_dict is not None:

easybuild/base/testing.py

@@ -86,7 +86,7 @@ def assertEqual(self, a, b, msg=None):
         """Make assertEqual always print useful messages"""
 
         try:
-            super(TestCase, self).assertEqual(a, b, msg=msg)
+            super().assertEqual(a, b, msg=msg)
         except AssertionError as e:
             if not self._is_diffable(a) or not self._is_diffable(b):
                 raise
@@ -132,7 +132,7 @@ def assertAllExist(self, paths, msg=None):
 
     def setUp(self):
         """Prepare test case."""
-        super(TestCase, self).setUp()
+        super().setUp()
 
         self.maxDiff = None
         self.longMessage = True
@@ -225,4 +225,4 @@ def tearDown(self):
         """Cleanup after running a test."""
         self.mock_stdout(False)
         self.mock_stderr(False)
-        super(TestCase, self).tearDown()
+        super().tearDown()

easybuild/framework/easyblock.py

@@ -3253,7 +3253,7 @@ def post_install_step(self):
         - run post install commands if any were specified
         """
         # even though post_install_step is deprecated in easyblocks we need to keep this here until it is
-        # removed in 6.0 for easyblocks calling super(EB_xxx, self).post_install_step()
+        # removed in 6.0 for easyblocks calling super().post_install_step()
         # The deprecation warning for those is below, in post_processing_step().
 
         lib_dir = os.path.join(self.installdir, 'lib')

easybuild/framework/easyconfig/format/convert.py

@@ -41,7 +41,7 @@ class Dependency(Convert):
 
     def __init__(self, obj, name=None):
         """Convert pass object to a dependency, use specified name if provided."""
-        super(Dependency, self).__init__(obj)
+        super().__init__(obj)
         if name is not None:
             self['name'] = name
 

easybuild/framework/easyconfig/format/one.py

@@ -104,7 +104,7 @@ class FormatOneZero(EasyConfigFormatConfigObj):
 
     def __init__(self, *args, **kwargs):
         """FormatOneZero constructor."""
-        super(FormatOneZero, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.log = fancylogger.getLogger(self.__class__.__name__, fname=False)
         self.strict_sanity_check_paths_keys = True
@@ -155,7 +155,7 @@ def parse(self, txt):
         Pre-process txt to extract header, docstring and pyheader, with non-indented section markers enforced.
         """
         self.rawcontent = txt
-        super(FormatOneZero, self).parse(self.rawcontent, strict_section_markers=True)
+        super().parse(self.rawcontent, strict_section_markers=True)
 
     def _reformat_line(self, param_name, param_val, outer=False, addlen=0):
         """

easybuild/framework/easyconfig/format/pyheaderconfigobj.py

@@ -158,7 +158,7 @@ class EasyConfigFormatConfigObj(EasyConfigFormat):
 
     def __init__(self, *args, **kwargs):
         """Extend EasyConfigFormat with some more attributes"""
-        super(EasyConfigFormatConfigObj, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.pyheader_localvars = None
         self.configobj = None
 

easybuild/framework/easyconfig/format/version.py

@@ -219,7 +219,7 @@ def versop_regex(self, begin_end=True):
         """
         # construct escaped operator symbols, e.g. '\<\='
         operators = []
-        for operator in self.OPERATOR_MAP.keys():
+        for operator in self.OPERATOR_MAP:
             operators.append(re.sub(r'(.)', r'\\\1', operator))
 
         # regex to parse version expression
@@ -477,7 +477,7 @@ def __init__(self, tcversop_str=None):
         Initialise VersionOperator instance.
         :param tcversop_str: intialise with toolchain version operator string
         """
-        super(ToolchainVersionOperator, self).__init__()
+        super().__init__()
 
         self.tc_name = None
         self.tcversop_str = None  # the full string
@@ -487,7 +487,7 @@ def __init__(self, tcversop_str=None):
 
     def __str__(self):
         """Return string representation of this instance"""
-        version_str = super(ToolchainVersionOperator, self).__str__()
+        version_str = super().__str__()
         return ''.join(map(str, [self.tc_name, self.SEPARATOR, version_str]))
 
     def __hash__(self):
@@ -511,7 +511,7 @@ def is_valid(self):
         """Check if this is a valid ToolchainVersionOperator"""
         tc_names = self._get_all_toolchain_names()
         known_tc_name = self.tc_name in tc_names
-        return known_tc_name and super(ToolchainVersionOperator, self).is_valid()
+        return known_tc_name and super().is_valid()
 
     def set(self, tcversop_str):
         """
@@ -535,7 +535,7 @@ def versop_regex(self):
         tc_names = self._get_all_toolchain_names()
         self.log.debug("found toolchain names %s" % tc_names)
 
-        versop_regex = super(ToolchainVersionOperator, self).versop_regex(begin_end=False)
+        versop_regex = super().versop_regex(begin_end=False)
         versop_pattern = r'(?P<versop_str>%s)' % versop_regex.pattern
         tc_names_regex = r'(?P<tc_name>(?:%s))' % '|'.join(tc_names)
         tc_regex = re.compile(r'^%s(?:%s%s)?$' % (tc_names_regex, self.SEPARATOR, versop_pattern))
@@ -556,7 +556,7 @@ def parse_versop_str(self, tcversop_str):
         tcversop_dict = res.groupdict()
         tcversop_dict['tcversop_str'] = tcversop_str  # the total string
 
-        tcversop_dict = super(ToolchainVersionOperator, self).parse_versop_str(None, versop_dict=tcversop_dict)
+        tcversop_dict = super().parse_versop_str(None, versop_dict=tcversop_dict)
 
         if tcversop_dict.get('version_str', None) is not None and tcversop_dict.get('operator_str', None) is None:
             raise EasyBuildError("Toolchain version found, but no operator (use ' == '?).")
@@ -586,7 +586,7 @@ def test(self, name, version):
         tc_name_res = name == self.tc_name
         if not tc_name_res:
             self.log.debug('Toolchain name %s different from test toolchain name %s' % (self.tc_name, name))
-        version_res = super(ToolchainVersionOperator, self).test(version)
+        version_res = super().test(version)
         res = tc_name_res and version_res
         self.log.debug("result of testing expression tc_name_res %s version_res %s: %s", tc_name_res, version_res, res)
 

easybuild/framework/extensioneasyblock.py

@@ -200,9 +200,9 @@ def sanity_check_step(self, exts_filter=None, custom_paths=None, custom_commands
                 self.clean_up_fake_module(fake_mod_data)
 
         if custom_paths or custom_commands or not self.is_extension:
-            super(ExtensionEasyBlock, self).sanity_check_step(custom_paths=custom_paths,
-                                                              custom_commands=custom_commands,
-                                                              extension=self.is_extension)
+            super().sanity_check_step(custom_paths=custom_paths,
+                                      custom_commands=custom_commands,
+                                      extension=self.is_extension)
 
         # pass or fail sanity check
         if sanity_check_ok: