Fix flake8 E251 unexpected spaces around keyword / parameter equals
Fixed automatically with autopep8:
git ls-files | grep py$ | xargs autopep8 --in-place --select E251
Change-Id: I58009e1c8c91c39745d559ac919be331d4cd9e77
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254598
Tested-by: David Pursehouse <dpursehouse@collab.net>
Reviewed-by: Mike Frysinger <vapier@google.com>
diff --git a/git_command.py b/git_command.py
index 4868ccd..34efda7 100644
--- a/git_command.py
+++ b/git_command.py
@@ -208,14 +208,14 @@
def __init__(self,
project,
cmdv,
- bare = False,
- provide_stdin = False,
- capture_stdout = False,
- capture_stderr = False,
- disable_editor = False,
- ssh_proxy = False,
- cwd = None,
- gitdir = None):
+ bare=False,
+ provide_stdin=False,
+ capture_stdout=False,
+ capture_stderr=False,
+ disable_editor=False,
+ ssh_proxy=False,
+ cwd=None,
+ gitdir=None):
env = self._GetBasicEnv()
# If we are not capturing std* then need to print it.
@@ -295,11 +295,11 @@
try:
p = subprocess.Popen(command,
- cwd = cwd,
- env = env,
- stdin = stdin,
- stdout = stdout,
- stderr = stderr)
+ cwd=cwd,
+ env=env,
+ stdin=stdin,
+ stdout=stdout,
+ stderr=stderr)
except Exception as e:
raise GitError('%s: %s' % (command[1], e))
diff --git a/git_config.py b/git_config.py
index 8de3200..8311d9f 100644
--- a/git_config.py
+++ b/git_config.py
@@ -85,13 +85,13 @@
@classmethod
def ForUser(cls):
if cls._ForUser is None:
- cls._ForUser = cls(configfile = os.path.expanduser('~/.gitconfig'))
+ cls._ForUser = cls(configfile=os.path.expanduser('~/.gitconfig'))
return cls._ForUser
@classmethod
def ForRepository(cls, gitdir, defaults=None):
- return cls(configfile = os.path.join(gitdir, 'config'),
- defaults = defaults)
+ return cls(configfile=os.path.join(gitdir, 'config'),
+ defaults=defaults)
def __init__(self, configfile, defaults=None, jsonFile=None):
self.file = configfile
@@ -107,13 +107,13 @@
os.path.dirname(self.file),
'.repo_' + os.path.basename(self.file) + '.json')
- def Has(self, name, include_defaults = True):
+ def Has(self, name, include_defaults=True):
"""Return true if this configuration file has the key.
"""
if _key(name) in self._cache:
return True
if include_defaults and self.defaults:
- return self.defaults.Has(name, include_defaults = True)
+ return self.defaults.Has(name, include_defaults=True)
return False
def GetBoolean(self, name):
@@ -142,7 +142,7 @@
v = self._cache[_key(name)]
except KeyError:
if self.defaults:
- return self.defaults.GetString(name, all_keys = all_keys)
+ return self.defaults.GetString(name, all_keys=all_keys)
v = []
if not all_keys:
@@ -153,7 +153,7 @@
r = []
r.extend(v)
if self.defaults:
- r.extend(self.defaults.GetString(name, all_keys = True))
+ r.extend(self.defaults.GetString(name, all_keys=True))
return r
def SetString(self, name, value):
@@ -217,7 +217,7 @@
"""
return self._sections.get(section, set())
- def HasSection(self, section, subsection = ''):
+ def HasSection(self, section, subsection=''):
"""Does at least one key in section.subsection exist?
"""
try:
@@ -323,8 +323,8 @@
p = GitCommand(None,
command,
- capture_stdout = True,
- capture_stderr = True)
+ capture_stdout=True,
+ capture_stderr=True)
if p.Wait() == 0:
return p.stdout
else:
@@ -731,7 +731,7 @@
def _Get(self, key, all_keys=False):
key = 'remote.%s.%s' % (self.name, key)
- return self._config.GetString(key, all_keys = all_keys)
+ return self._config.GetString(key, all_keys=all_keys)
class Branch(object):
@@ -780,4 +780,4 @@
def _Get(self, key, all_keys=False):
key = 'branch.%s.%s' % (self.name, key)
- return self._config.GetString(key, all_keys = all_keys)
+ return self._config.GetString(key, all_keys=all_keys)
diff --git a/manifest_xml.py b/manifest_xml.py
index e951bbf..2be717e 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -140,12 +140,12 @@
self._load_local_manifests = True
self.repoProject = MetaProject(self, 'repo',
- gitdir = os.path.join(repodir, 'repo/.git'),
- worktree = os.path.join(repodir, 'repo'))
+ gitdir=os.path.join(repodir, 'repo/.git'),
+ worktree=os.path.join(repodir, 'repo'))
self.manifestProject = MetaProject(self, 'manifests',
- gitdir = os.path.join(repodir, 'manifests.git'),
- worktree = os.path.join(repodir, 'manifests'))
+ gitdir=os.path.join(repodir, 'manifests.git'),
+ worktree=os.path.join(repodir, 'manifests'))
self._Unload()
@@ -682,15 +682,15 @@
if name not in self._projects:
m.PreSync()
gitdir = os.path.join(self.topdir, '%s.git' % name)
- project = Project(manifest = self,
- name = name,
- remote = remote.ToRemoteSpec(name),
- gitdir = gitdir,
- objdir = gitdir,
- worktree = None,
- relpath = name or None,
- revisionExpr = m.revisionExpr,
- revisionId = None)
+ project = Project(manifest=self,
+ name=name,
+ remote=remote.ToRemoteSpec(name),
+ gitdir=gitdir,
+ objdir=gitdir,
+ worktree=None,
+ relpath=name or None,
+ revisionExpr=m.revisionExpr,
+ revisionId=None)
self._projects[project.name] = [project]
self._paths[project.relpath] = project
@@ -798,7 +798,7 @@
def _UnjoinName(self, parent_name, name):
return os.path.relpath(name, parent_name)
- def _ParseProject(self, node, parent = None, **extra_proj_attrs):
+ def _ParseProject(self, node, parent=None, **extra_proj_attrs):
"""
reads a <project> element from the manifest file
"""
@@ -883,24 +883,24 @@
if node.getAttribute('force-path').lower() in ("yes", "true", "1"):
gitdir = os.path.join(self.topdir, '%s.git' % path)
- project = Project(manifest = self,
- name = name,
- remote = remote.ToRemoteSpec(name),
- gitdir = gitdir,
- objdir = objdir,
- worktree = worktree,
- relpath = relpath,
- revisionExpr = revisionExpr,
- revisionId = None,
- rebase = rebase,
- groups = groups,
- sync_c = sync_c,
- sync_s = sync_s,
- sync_tags = sync_tags,
- clone_depth = clone_depth,
- upstream = upstream,
- parent = parent,
- dest_branch = dest_branch,
+ project = Project(manifest=self,
+ name=name,
+ remote=remote.ToRemoteSpec(name),
+ gitdir=gitdir,
+ objdir=objdir,
+ worktree=worktree,
+ relpath=relpath,
+ revisionExpr=revisionExpr,
+ revisionId=None,
+ rebase=rebase,
+ groups=groups,
+ sync_c=sync_c,
+ sync_s=sync_s,
+ sync_tags=sync_tags,
+ clone_depth=clone_depth,
+ upstream=upstream,
+ parent=parent,
+ dest_branch=dest_branch,
**extra_proj_attrs)
for n in node.childNodes:
@@ -911,7 +911,7 @@
if n.nodeName == 'annotation':
self._ParseAnnotation(project, n)
if n.nodeName == 'project':
- project.subprojects.append(self._ParseProject(n, parent = project))
+ project.subprojects.append(self._ParseProject(n, parent=project))
return project
@@ -1125,7 +1125,7 @@
gitc_client_name)
self.manifestFile = os.path.join(self.gitc_client_dir, '.manifest')
- def _ParseProject(self, node, parent = None):
+ def _ParseProject(self, node, parent=None):
"""Override _ParseProject and add support for GITC specific attributes."""
return super(GitcManifest, self)._ParseProject(
node, parent=parent, old_revision=node.getAttribute('old-revision'))
diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py
index a541a04..bd396fa 100644
--- a/subcmds/cherry_pick.py
+++ b/subcmds/cherry_pick.py
@@ -46,8 +46,8 @@
p = GitCommand(None,
['rev-parse', '--verify', reference],
- capture_stdout = True,
- capture_stderr = True)
+ capture_stdout=True,
+ capture_stderr=True)
if p.Wait() != 0:
print(p.stderr, file=sys.stderr)
sys.exit(1)
@@ -61,8 +61,8 @@
p = GitCommand(None,
['cherry-pick', sha1],
- capture_stdout = True,
- capture_stderr = True)
+ capture_stdout=True,
+ capture_stderr=True)
status = p.Wait()
print(p.stdout, file=sys.stdout)
@@ -74,9 +74,9 @@
new_msg = self._Reformat(old_msg, sha1)
p = GitCommand(None, ['commit', '--amend', '-F', '-'],
- provide_stdin = True,
- capture_stdout = True,
- capture_stderr = True)
+ provide_stdin=True,
+ capture_stdout=True,
+ capture_stderr=True)
p.stdin.write(new_msg)
p.stdin.close()
if p.Wait() != 0:
diff --git a/subcmds/diffmanifests.py b/subcmds/diffmanifests.py
index b999699..9bdb5e1 100644
--- a/subcmds/diffmanifests.py
+++ b/subcmds/diffmanifests.py
@@ -184,10 +184,10 @@
self.out = _Coloring(self.manifest.globalConfig)
self.printText = self.out.nofmt_printer('text')
if opt.color:
- self.printProject = self.out.nofmt_printer('project', attr = 'bold')
- self.printAdded = self.out.nofmt_printer('green', fg = 'green', attr = 'bold')
- self.printRemoved = self.out.nofmt_printer('red', fg = 'red', attr = 'bold')
- self.printRevision = self.out.nofmt_printer('revision', fg = 'yellow')
+ self.printProject = self.out.nofmt_printer('project', attr='bold')
+ self.printAdded = self.out.nofmt_printer('green', fg='green', attr='bold')
+ self.printRemoved = self.out.nofmt_printer('red', fg='red', attr='bold')
+ self.printRevision = self.out.nofmt_printer('revision', fg='yellow')
else:
self.printProject = self.printAdded = self.printRemoved = self.printRevision = self.printText
diff --git a/subcmds/info.py b/subcmds/info.py
index a9ad52a..cff97fb 100644
--- a/subcmds/info.py
+++ b/subcmds/info.py
@@ -44,12 +44,12 @@
def Execute(self, opt, args):
self.out = _Coloring(self.manifest.globalConfig)
- self.heading = self.out.printer('heading', attr = 'bold')
- self.headtext = self.out.nofmt_printer('headtext', fg = 'yellow')
- self.redtext = self.out.printer('redtext', fg = 'red')
- self.sha = self.out.printer("sha", fg = 'yellow')
+ self.heading = self.out.printer('heading', attr='bold')
+ self.headtext = self.out.nofmt_printer('headtext', fg='yellow')
+ self.redtext = self.out.printer('redtext', fg='red')
+ self.sha = self.out.printer("sha", fg='yellow')
self.text = self.out.nofmt_printer('text')
- self.dimtext = self.out.printer('dimtext', attr = 'dim')
+ self.dimtext = self.out.printer('dimtext', attr='dim')
self.opt = opt
diff --git a/subcmds/manifest.py b/subcmds/manifest.py
index 9c1b3f0..6bb0104 100644
--- a/subcmds/manifest.py
+++ b/subcmds/manifest.py
@@ -66,8 +66,8 @@
else:
fd = open(opt.output_file, 'w')
self.manifest.Save(fd,
- peg_rev = opt.peg_rev,
- peg_rev_upstream = opt.peg_rev_upstream)
+ peg_rev=opt.peg_rev,
+ peg_rev_upstream=opt.peg_rev_upstream)
fd.close()
if opt.output_file != '-':
print('Saved manifest to %s' % opt.output_file, file=sys.stderr)
diff --git a/subcmds/selfupdate.py b/subcmds/selfupdate.py
index a8a09b6..b157e2f 100644
--- a/subcmds/selfupdate.py
+++ b/subcmds/selfupdate.py
@@ -59,5 +59,5 @@
rp.bare_git.gc('--auto')
_PostRepoFetch(rp,
- no_repo_verify = opt.no_repo_verify,
- verbose = True)
+ no_repo_verify=opt.no_repo_verify,
+ verbose=True)
diff --git a/subcmds/status.py b/subcmds/status.py
index 63972d7..6012ae2 100644
--- a/subcmds/status.py
+++ b/subcmds/status.py
@@ -170,8 +170,8 @@
class StatusColoring(Coloring):
def __init__(self, config):
Coloring.__init__(self, config, 'status')
- self.project = self.printer('header', attr = 'bold')
- self.untracked = self.printer('untracked', fg = 'red')
+ self.project = self.printer('header', attr='bold')
+ self.untracked = self.printer('untracked', fg='red')
orig_path = os.getcwd()
try:
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 68ad88d..13c419c 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -396,8 +396,8 @@
err_event=err_event,
clone_filter=self.manifest.CloneFilter)
if self.jobs > 1:
- t = _threading.Thread(target = self._FetchProjectList,
- kwargs = kwargs)
+ t = _threading.Thread(target=self._FetchProjectList,
+ kwargs=kwargs)
# Ensure that Ctrl-C will not freeze the repo process.
t.daemon = True
threads.add(t)
@@ -704,16 +704,16 @@
gitdir = os.path.join(self.manifest.topdir, path, '.git')
if os.path.exists(gitdir):
project = Project(
- manifest = self.manifest,
- name = path,
- remote = RemoteSpec('origin'),
- gitdir = gitdir,
- objdir = gitdir,
- worktree = os.path.join(self.manifest.topdir, path),
- relpath = path,
- revisionExpr = 'HEAD',
- revisionId = None,
- groups = None)
+ manifest=self.manifest,
+ name=path,
+ remote=RemoteSpec('origin'),
+ gitdir=gitdir,
+ objdir=gitdir,
+ worktree=os.path.join(self.manifest.topdir, path),
+ relpath=path,
+ revisionExpr='HEAD',
+ revisionId=None,
+ groups=None)
if project.IsDirty() and opt.force_remove_dirty:
print('WARNING: Removing dirty project "%s": uncommitted changes '
@@ -1100,9 +1100,9 @@
cmd = [GIT, 'tag', '-v', cur]
proc = subprocess.Popen(cmd,
- stdout = subprocess.PIPE,
- stderr = subprocess.PIPE,
- env = env)
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ env=env)
out = proc.stdout.read()
proc.stdout.close()
diff --git a/subcmds/upload.py b/subcmds/upload.py
index 25827c9..b81cf0a 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -441,14 +441,14 @@
def _GetMergeBranch(self, project):
p = GitCommand(project,
['rev-parse', '--abbrev-ref', 'HEAD'],
- capture_stdout = True,
- capture_stderr = True)
+ capture_stdout=True,
+ capture_stderr=True)
p.Wait()
local_branch = p.stdout.strip()
p = GitCommand(project,
['config', '--get', 'branch.%s.merge' % local_branch],
- capture_stdout = True,
- capture_stderr = True)
+ capture_stdout=True,
+ capture_stderr=True)
p.Wait()
merge_branch = p.stdout.strip()
return merge_branch
