Merge pull request #4834 from Flamefire/super-calls

Remove Python2 constructs

Author: Micket

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

@@ -864,7 +864,7 @@ def get_option_by_long_name(self, name):
         return None
 
 
-class GeneralOption(object):
+class GeneralOption:
     """
     'Used-to-be simple' wrapper class for option parsing
 
@@ -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/optcomplete.py

@@ -149,7 +149,7 @@ class CompleterMissingCallArgument(Exception):
     """Exception to raise when call arg is missing"""
 
 
-class Completer(object):
+class Completer:
     """Base class to derive all other completer classes from.
     It generates an empty completion list
     """
@@ -605,7 +605,7 @@ def autocomplete(parser, arg_completer=None, opt_completer=None, subcmd_complete
     sys.exit(1)
 
 
-class CmdComplete(object):
+class CmdComplete:
 
     """Simple default base class implementation for a subcommand that supports
     command completion.  This class is assuming that there might be a method

easybuild/base/rest.py

@@ -46,7 +46,7 @@
 from easybuild.base import fancylogger
 
 
-class Client(object):
+class Client:
     """An implementation of a REST client"""
     DELETE = 'DELETE'
     GET = 'GET'
@@ -217,7 +217,7 @@ def get_connection(self, method, url, body, headers):
         return connection
 
 
-class RequestBuilder(object):
+class RequestBuilder:
     '''RequestBuilder(client).path.to.resource.method(...)
         stands for
     RequestBuilder(client).client.method('path/to/resource, ...)
@@ -265,7 +265,7 @@ def __repr__(self):
         return '%s: %s' % (self.__class__, self.url)
 
 
-class RestClient(object):
+class RestClient:
     """
     A client with a request builder, so you can easily create rest requests
     e.g. to create a github Rest API client just do

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

@@ -129,7 +129,7 @@
 _log = fancylogger.getLogger('easyblock')
 
 
-class EasyBlock(object):
+class EasyBlock:
     """Generic support for building and installing software, base class for actual easyblocks."""
 
     # static class method for extra easyconfig parameter definitions
@@ -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/easyconfig.py

@@ -422,7 +422,7 @@ def get_toolchain_hierarchy(parent_toolchain, incl_capabilities=False):
     return toolchain_hierarchy
 
 
-class EasyConfig(object):
+class EasyConfig:
     """
     Class which handles loading, reading, validation of easyconfigs
     """

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/format.py

@@ -130,7 +130,7 @@ def __init__(self, parent=None, depth=None):
         NestedDict.__init__(self, self, 0)
 
 
-class Squashed(object):
+class Squashed:
     """Class to ease the squashing of OrderedVersionOperators and OrderedToolchainVersionOperators"""
 
     def __init__(self):
@@ -184,7 +184,7 @@ def final(self):
         return self.result
 
 
-class EBConfigObj(object):
+class EBConfigObj:
     """
     Enhanced ConfigObj, version/toolchain and other easyconfig specific aspects aware
 
@@ -600,7 +600,7 @@ def get_specs_for(self, version=None, tcname=None, tcversion=None):
         return res
 
 
-class EasyConfigFormat(object):
+class EasyConfigFormat:
     """EasyConfigFormat class"""
     VERSION = EasyVersion('0.0')  # dummy EasyVersion instance (shouldn't be None)
     USABLE = False  # disable this class as usable format