mirror of
https://gerrit.googlesource.com/git-repo
synced 2025-01-02 16:14:25 +00:00
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>
This commit is contained in:
parent
057905fa1d
commit
5d9c4972e0
16
error.py
16
error.py
@ -37,7 +37,7 @@ class NoManifestException(Exception):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, path, reason):
|
def __init__(self, path, reason):
|
||||||
super(NoManifestException, self).__init__(path, reason)
|
super().__init__(path, reason)
|
||||||
self.path = path
|
self.path = path
|
||||||
self.reason = reason
|
self.reason = reason
|
||||||
|
|
||||||
@ -50,7 +50,7 @@ class EditorError(Exception):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, reason):
|
def __init__(self, reason):
|
||||||
super(EditorError, self).__init__(reason)
|
super().__init__(reason)
|
||||||
self.reason = reason
|
self.reason = reason
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
@ -62,7 +62,7 @@ class GitError(Exception):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, command):
|
def __init__(self, command):
|
||||||
super(GitError, self).__init__(command)
|
super().__init__(command)
|
||||||
self.command = command
|
self.command = command
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
@ -74,7 +74,7 @@ class UploadError(Exception):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, reason):
|
def __init__(self, reason):
|
||||||
super(UploadError, self).__init__(reason)
|
super().__init__(reason)
|
||||||
self.reason = reason
|
self.reason = reason
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
@ -86,7 +86,7 @@ class DownloadError(Exception):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, reason):
|
def __init__(self, reason):
|
||||||
super(DownloadError, self).__init__(reason)
|
super().__init__(reason)
|
||||||
self.reason = reason
|
self.reason = reason
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
@ -98,7 +98,7 @@ class NoSuchProjectError(Exception):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, name=None):
|
def __init__(self, name=None):
|
||||||
super(NoSuchProjectError, self).__init__(name)
|
super().__init__(name)
|
||||||
self.name = name
|
self.name = name
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
@ -112,7 +112,7 @@ class InvalidProjectGroupsError(Exception):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, name=None):
|
def __init__(self, name=None):
|
||||||
super(InvalidProjectGroupsError, self).__init__(name)
|
super().__init__(name)
|
||||||
self.name = name
|
self.name = name
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
@ -128,7 +128,7 @@ class RepoChangedException(Exception):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, extra_args=None):
|
def __init__(self, extra_args=None):
|
||||||
super(RepoChangedException, self).__init__(extra_args)
|
super().__init__(extra_args)
|
||||||
self.extra_args = extra_args or []
|
self.extra_args = extra_args or []
|
||||||
|
|
||||||
|
|
||||||
|
@ -1301,7 +1301,7 @@ class GitcManifest(XmlManifest):
|
|||||||
|
|
||||||
def _ParseProject(self, node, parent=None):
|
def _ParseProject(self, node, parent=None):
|
||||||
"""Override _ParseProject and add support for GITC specific attributes."""
|
"""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'))
|
node, parent=parent, old_revision=node.getAttribute('old-revision'))
|
||||||
|
|
||||||
def _output_manifest_project_extras(self, p, e):
|
def _output_manifest_project_extras(self, p, e):
|
||||||
@ -1325,7 +1325,7 @@ class RepoClient(XmlManifest):
|
|||||||
if manifest_file is None:
|
if manifest_file is None:
|
||||||
manifest_file = os.path.join(repodir, MANIFEST_FILE_NAME)
|
manifest_file = os.path.join(repodir, MANIFEST_FILE_NAME)
|
||||||
local_manifests = os.path.abspath(os.path.join(repodir, LOCAL_MANIFESTS_DIR_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.
|
# TODO: Completely separate manifest logic out of the client.
|
||||||
self.manifest = self
|
self.manifest = self
|
||||||
@ -1340,6 +1340,5 @@ class GitcClient(RepoClient, GitcManifest):
|
|||||||
self.gitc_client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(),
|
self.gitc_client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(),
|
||||||
gitc_client_name)
|
gitc_client_name)
|
||||||
|
|
||||||
super(GitcManifest, self).__init__(
|
super().__init__(repodir, os.path.join(self.gitc_client_dir, '.manifest'))
|
||||||
repodir, os.path.join(self.gitc_client_dir, '.manifest'))
|
|
||||||
self.isGitcClient = True
|
self.isGitcClient = True
|
||||||
|
@ -232,7 +232,7 @@ class ReviewableBranch(object):
|
|||||||
class StatusColoring(Coloring):
|
class StatusColoring(Coloring):
|
||||||
|
|
||||||
def __init__(self, config):
|
def __init__(self, config):
|
||||||
Coloring.__init__(self, config, 'status')
|
super().__init__(config, 'status')
|
||||||
self.project = self.printer('header', attr='bold')
|
self.project = self.printer('header', attr='bold')
|
||||||
self.branch = self.printer('header', attr='bold')
|
self.branch = self.printer('header', attr='bold')
|
||||||
self.nobranch = self.printer('nobranch', fg='red')
|
self.nobranch = self.printer('nobranch', fg='red')
|
||||||
@ -246,7 +246,7 @@ class StatusColoring(Coloring):
|
|||||||
class DiffColoring(Coloring):
|
class DiffColoring(Coloring):
|
||||||
|
|
||||||
def __init__(self, config):
|
def __init__(self, config):
|
||||||
Coloring.__init__(self, config, 'diff')
|
super().__init__(config, 'diff')
|
||||||
self.project = self.printer('header', attr='bold')
|
self.project = self.printer('header', attr='bold')
|
||||||
self.fail = self.printer('fail', fg='red')
|
self.fail = self.printer('fail', fg='red')
|
||||||
|
|
||||||
@ -3091,7 +3091,7 @@ class _Later(object):
|
|||||||
class _SyncColoring(Coloring):
|
class _SyncColoring(Coloring):
|
||||||
|
|
||||||
def __init__(self, config):
|
def __init__(self, config):
|
||||||
Coloring.__init__(self, config, 'reposync')
|
super().__init__(config, 'reposync')
|
||||||
self.project = self.printer('header', attr='bold')
|
self.project = self.printer('header', attr='bold')
|
||||||
self.info = self.printer('info')
|
self.info = self.printer('info')
|
||||||
self.fail = self.printer('fail', fg='red')
|
self.fail = self.printer('fail', fg='red')
|
||||||
|
@ -47,7 +47,7 @@ use for this GITC client.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def _Options(self, p):
|
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 = p.add_option_group('GITC options')
|
||||||
g.add_option('-f', '--manifest-file',
|
g.add_option('-f', '--manifest-file',
|
||||||
dest='manifest_file',
|
dest='manifest_file',
|
||||||
@ -64,7 +64,7 @@ use for this GITC client.
|
|||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
self.client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(),
|
self.client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(),
|
||||||
gitc_client)
|
gitc_client)
|
||||||
super(GitcInit, self).Execute(opt, args)
|
super().Execute(opt, args)
|
||||||
|
|
||||||
manifest_file = self.manifest.manifestFile
|
manifest_file = self.manifest.manifestFile
|
||||||
if opt.manifest_file:
|
if opt.manifest_file:
|
||||||
|
Loading…
Reference in New Issue
Block a user