use simpler super() magic
Python 3 has a simpler super() style so switch to it to make the
code a little simpler and to stop pylint warnings.
Change-Id: I1b3ccf57ae968d56a9a0bcfc1258fbd8bfa3afee
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/297383
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
diff --git a/error.py b/error.py
index 20d5f72..2fb6aa0 100644
--- a/error.py
+++ b/error.py
@@ -37,7 +37,7 @@
"""
def __init__(self, path, reason):
- super(NoManifestException, self).__init__(path, reason)
+ super().__init__(path, reason)
self.path = path
self.reason = reason
@@ -50,7 +50,7 @@
"""
def __init__(self, reason):
- super(EditorError, self).__init__(reason)
+ super().__init__(reason)
self.reason = reason
def __str__(self):
@@ -62,7 +62,7 @@
"""
def __init__(self, command):
- super(GitError, self).__init__(command)
+ super().__init__(command)
self.command = command
def __str__(self):
@@ -74,7 +74,7 @@
"""
def __init__(self, reason):
- super(UploadError, self).__init__(reason)
+ super().__init__(reason)
self.reason = reason
def __str__(self):
@@ -86,7 +86,7 @@
"""
def __init__(self, reason):
- super(DownloadError, self).__init__(reason)
+ super().__init__(reason)
self.reason = reason
def __str__(self):
@@ -98,7 +98,7 @@
"""
def __init__(self, name=None):
- super(NoSuchProjectError, self).__init__(name)
+ super().__init__(name)
self.name = name
def __str__(self):
@@ -112,7 +112,7 @@
"""
def __init__(self, name=None):
- super(InvalidProjectGroupsError, self).__init__(name)
+ super().__init__(name)
self.name = name
def __str__(self):
@@ -128,7 +128,7 @@
"""
def __init__(self, extra_args=None):
- super(RepoChangedException, self).__init__(extra_args)
+ super().__init__(extra_args)
self.extra_args = extra_args or []
diff --git a/manifest_xml.py b/manifest_xml.py
index 84e3d9f..ff8e061 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -1301,7 +1301,7 @@
def _ParseProject(self, node, parent=None):
"""Override _ParseProject and add support for GITC specific attributes."""
- return super(GitcManifest, self)._ParseProject(
+ return super()._ParseProject(
node, parent=parent, old_revision=node.getAttribute('old-revision'))
def _output_manifest_project_extras(self, p, e):
@@ -1325,7 +1325,7 @@
if manifest_file is None:
manifest_file = os.path.join(repodir, MANIFEST_FILE_NAME)
local_manifests = os.path.abspath(os.path.join(repodir, LOCAL_MANIFESTS_DIR_NAME))
- super(RepoClient, self).__init__(repodir, manifest_file, local_manifests)
+ super().__init__(repodir, manifest_file, local_manifests)
# TODO: Completely separate manifest logic out of the client.
self.manifest = self
@@ -1340,6 +1340,5 @@
self.gitc_client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(),
gitc_client_name)
- super(GitcManifest, self).__init__(
- repodir, os.path.join(self.gitc_client_dir, '.manifest'))
+ super().__init__(repodir, os.path.join(self.gitc_client_dir, '.manifest'))
self.isGitcClient = True
diff --git a/project.py b/project.py
index 86f41f2..52a77f1 100644
--- a/project.py
+++ b/project.py
@@ -232,7 +232,7 @@
class StatusColoring(Coloring):
def __init__(self, config):
- Coloring.__init__(self, config, 'status')
+ super().__init__(config, 'status')
self.project = self.printer('header', attr='bold')
self.branch = self.printer('header', attr='bold')
self.nobranch = self.printer('nobranch', fg='red')
@@ -246,7 +246,7 @@
class DiffColoring(Coloring):
def __init__(self, config):
- Coloring.__init__(self, config, 'diff')
+ super().__init__(config, 'diff')
self.project = self.printer('header', attr='bold')
self.fail = self.printer('fail', fg='red')
@@ -3091,7 +3091,7 @@
class _SyncColoring(Coloring):
def __init__(self, config):
- Coloring.__init__(self, config, 'reposync')
+ super().__init__(config, 'reposync')
self.project = self.printer('header', attr='bold')
self.info = self.printer('info')
self.fail = self.printer('fail', fg='red')
diff --git a/subcmds/gitc_init.py b/subcmds/gitc_init.py
index 7ecfdca..89472ed 100644
--- a/subcmds/gitc_init.py
+++ b/subcmds/gitc_init.py
@@ -47,7 +47,7 @@
"""
def _Options(self, p):
- super(GitcInit, self)._Options(p, gitc_init=True)
+ super()._Options(p, gitc_init=True)
g = p.add_option_group('GITC options')
g.add_option('-f', '--manifest-file',
dest='manifest_file',
@@ -64,7 +64,7 @@
sys.exit(1)
self.client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(),
gitc_client)
- super(GitcInit, self).Execute(opt, args)
+ super().Execute(opt, args)
manifest_file = self.manifest.manifestFile
if opt.manifest_file:
