Fix various whitespace issues reported by pyflakes
- E201 whitespace after '['
- E202 whitespace before '}'
- E221 multiple spaces before operator
- E222 multiple spaces after operator
- E225 missing whitespace around operator
- E226 missing whitespace around arithmetic operator
- E231 missing whitespace after ','
- E261 at least two spaces before inline comment
- E271 multiple spaces after keyword
Fixed automatically with autopep8:
git ls-files | grep py$ | xargs autopep8 --in-place \
--select E201,E202,E221,E222,E225,E226,E231,E261,E271
Change-Id: I367113eb8c847eb460532c7c2f8643f33040308c
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254601
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: David Pursehouse <dpursehouse@collab.net>
diff --git a/event_log.py b/event_log.py
index 315d752..45800a5 100644
--- a/event_log.py
+++ b/event_log.py
@@ -138,7 +138,7 @@
Returns:
A dictionary of the event added to the log.
"""
- event['status'] = self.GetStatusString(success)
+ event['status'] = self.GetStatusString(success)
event['finish_time'] = finish
return event
diff --git a/git_command.py b/git_command.py
index 34efda7..5034ae1 100644
--- a/git_command.py
+++ b/git_command.py
@@ -101,7 +101,7 @@
return _git_version
def __getattr__(self, name):
- name = name.replace('_','-')
+ name = name.replace('_', '-')
def fun(*cmdv):
command = [name]
command.extend(cmdv)
diff --git a/git_config.py b/git_config.py
index 8311d9f..8cc52da 100644
--- a/git_config.py
+++ b/git_config.py
@@ -75,7 +75,7 @@
parts = name.split('.')
if len(parts) < 2:
return name.lower()
- parts[ 0] = parts[ 0].lower()
+ parts[0] = parts[0].lower()
parts[-1] = parts[-1].lower()
return '.'.join(parts)
@@ -430,7 +430,7 @@
# We will make two calls to ssh; this is the common part of both calls.
command_base = ['ssh',
- '-o','ControlPath %s' % ssh_sock(),
+ '-o', 'ControlPath %s' % ssh_sock(),
host]
if port is not None:
command_base[1:1] = ['-p', str(port)]
@@ -439,13 +439,13 @@
# ...but before actually starting a master, we'll double-check. This can
# be important because we can't tell that that 'git@myhost.com' is the same
# as 'myhost.com' where "User git" is setup in the user's ~/.ssh/config file.
- check_command = command_base + ['-O','check']
+ check_command = command_base + ['-O', 'check']
try:
Trace(': %s', ' '.join(check_command))
check_process = subprocess.Popen(check_command,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
- check_process.communicate() # read output, but ignore it...
+ check_process.communicate() # read output, but ignore it...
isnt_running = check_process.wait()
if not isnt_running:
@@ -467,7 +467,7 @@
except Exception as e:
_ssh_master = False
print('\nwarn: cannot enable ssh control master for %s:%s\n%s'
- % (host,port, str(e)), file=sys.stderr)
+ % (host, port, str(e)), file=sys.stderr)
return False
time.sleep(1)
diff --git a/git_refs.py b/git_refs.py
index debd4cb..02b98cb 100644
--- a/git_refs.py
+++ b/git_refs.py
@@ -18,12 +18,12 @@
from repo_trace import Trace
import platform_utils
-HEAD = 'HEAD'
+HEAD = 'HEAD'
R_CHANGES = 'refs/changes/'
-R_HEADS = 'refs/heads/'
-R_TAGS = 'refs/tags/'
-R_PUB = 'refs/published/'
-R_M = 'refs/remotes/m/'
+R_HEADS = 'refs/heads/'
+R_TAGS = 'refs/tags/'
+R_PUB = 'refs/published/'
+R_M = 'refs/remotes/m/'
class GitRefs(object):
diff --git a/gitc_utils.py b/gitc_utils.py
index 8b5b007..a2b04d9 100644
--- a/gitc_utils.py
+++ b/gitc_utils.py
@@ -121,7 +121,7 @@
index = 0
while index < len(projects):
_set_project_revisions(
- projects[index:(index+NUM_BATCH_RETRIEVE_REVISIONID)])
+ projects[index:(index + NUM_BATCH_RETRIEVE_REVISIONID)])
index += NUM_BATCH_RETRIEVE_REVISIONID
if gitc_manifest is not None:
diff --git a/main.py b/main.py
index b2845d8..7dbdbfa 100755
--- a/main.py
+++ b/main.py
@@ -476,7 +476,7 @@
n = netrc.netrc()
for host in n.hosts:
p = n.hosts[host]
- mgr.add_password(p[1], 'http://%s/' % host, p[0], p[2])
+ mgr.add_password(p[1], 'http://%s/' % host, p[0], p[2])
mgr.add_password(p[1], 'https://%s/' % host, p[0], p[2])
except netrc.NetrcParseError:
pass
diff --git a/manifest_xml.py b/manifest_xml.py
index d24dbce..9df03c0 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -224,7 +224,7 @@
if self.notice:
notice_element = root.appendChild(doc.createElement('notice'))
notice_lines = self.notice.splitlines()
- indented_notice = ('\n'.join(" "*4 + line for line in notice_lines))[4:]
+ indented_notice = ('\n'.join(" " * 4 + line for line in notice_lines))[4:]
notice_element.appendChild(doc.createTextNode(indented_notice))
d = self.default
@@ -855,7 +855,7 @@
if clone_depth:
try:
clone_depth = int(clone_depth)
- if clone_depth <= 0:
+ if clone_depth <= 0:
raise ValueError()
except ValueError:
raise ManifestParseError('invalid clone-depth %s in %s' %
diff --git a/subcmds/abandon.py b/subcmds/abandon.py
index cd1d0c4..ba4ef09 100644
--- a/subcmds/abandon.py
+++ b/subcmds/abandon.py
@@ -79,10 +79,10 @@
if err:
for br in err.keys():
- err_msg = "error: cannot abandon %s" %br
+ err_msg = "error: cannot abandon %s" % br
print(err_msg, file=sys.stderr)
for proj in err[br]:
- print(' '*len(err_msg) + " | %s" % proj.relpath, file=sys.stderr)
+ print(' ' * len(err_msg) + " | %s" % proj.relpath, file=sys.stderr)
sys.exit(1)
elif not success:
print('error: no project has local branch(es) : %s' % nb,
@@ -95,5 +95,5 @@
result = "all project"
else:
result = "%s" % (
- ('\n'+' '*width + '| ').join(p.relpath for p in success[br]))
- print("%s%s| %s\n" % (br,' '*(width-len(br)), result),file=sys.stderr)
+ ('\n' + ' ' * width + '| ').join(p.relpath for p in success[br]))
+ print("%s%s| %s\n" % (br, ' ' * (width - len(br)), result), file=sys.stderr)
diff --git a/subcmds/branches.py b/subcmds/branches.py
index b895884..b4894ec 100644
--- a/subcmds/branches.py
+++ b/subcmds/branches.py
@@ -23,7 +23,7 @@
def __init__(self, config):
Coloring.__init__(self, config, 'branch')
self.current = self.printer('current', fg='green')
- self.local = self.printer('local')
+ self.local = self.printer('local')
self.notinproject = self.printer('notinproject', fg='red')
class BranchInfo(object):
@@ -170,11 +170,11 @@
fmt = out.current if i.IsCurrent else out.write
for p in paths:
out.nl()
- fmt(width*' ' + ' %s' % p)
+ fmt(width * ' ' + ' %s' % p)
fmt = out.write
for p in non_cur_paths:
out.nl()
- fmt(width*' ' + ' %s' % p)
+ fmt(width * ' ' + ' %s' % p)
else:
out.write(' in all projects')
out.nl()
diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py
index bd396fa..8d81be3 100644
--- a/subcmds/cherry_pick.py
+++ b/subcmds/cherry_pick.py
@@ -97,7 +97,7 @@
def _StripHeader(self, commit_msg):
lines = commit_msg.splitlines()
- return "\n".join(lines[lines.index("")+1:])
+ return "\n".join(lines[lines.index("") + 1:])
def _Reformat(self, old_msg, sha1):
new_msg = []
diff --git a/subcmds/forall.py b/subcmds/forall.py
index 131ba67..9706760 100644
--- a/subcmds/forall.py
+++ b/subcmds/forall.py
@@ -195,7 +195,7 @@
cmd.append(cmd[0])
cmd.extend(opt.command[1:])
- if opt.project_header \
+ if opt.project_header \
and not shell \
and cmd[0] == 'git':
# If this is a direct git command that can enable colorized
diff --git a/subcmds/info.py b/subcmds/info.py
index cff97fb..a6faf16 100644
--- a/subcmds/info.py
+++ b/subcmds/info.py
@@ -204,7 +204,7 @@
for commit in commits:
split = commit.split()
- self.text('{0:38}{1} '.format('','-'))
+ self.text('{0:38}{1} '.format('', '-'))
self.sha(split[0] + " ")
self.text(" ".join(split[1:]))
self.out.nl()
diff --git a/subcmds/init.py b/subcmds/init.py
index a795006..191f02b 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -349,7 +349,7 @@
while True:
print()
- name = self._Prompt('Your Name', mp.UserName)
+ name = self._Prompt('Your Name', mp.UserName)
email = self._Prompt('Your Email', mp.UserEmail)
print()
diff --git a/subcmds/list.py b/subcmds/list.py
index 231da94..1cd971e 100644
--- a/subcmds/list.py
+++ b/subcmds/list.py
@@ -76,7 +76,7 @@
lines = []
for project in projects:
if opt.name_only and not opt.path_only:
- lines.append("%s" % ( project.name))
+ lines.append("%s" % (project.name))
elif opt.path_only and not opt.name_only:
lines.append("%s" % (_getpath(project)))
else:
diff --git a/subcmds/start.py b/subcmds/start.py
index 6ec0b2c..9b81086 100644
--- a/subcmds/start.py
+++ b/subcmds/start.py
@@ -60,7 +60,7 @@
if not opt.all:
projects = args[1:]
if len(projects) < 1:
- projects = ['.',] # start it in the local project by default
+ projects = ['.'] # start it in the local project by default
all_projects = self.GetProjects(projects,
missing_ok=bool(self.gitc_manifest))
diff --git a/subcmds/sync.py b/subcmds/sync.py
index df23034..9e4c775 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -217,7 +217,7 @@
p.add_option('-l', '--local-only',
dest='local_only', action='store_true',
help="only update working tree, don't fetch")
- p.add_option('--no-manifest-update','--nmu',
+ p.add_option('--no-manifest-update', '--nmu',
dest='mp_update', action='store_false', default='true',
help='use the existing manifest checkout as-is. '
'(do not update to the latest revision)')
@@ -1136,7 +1136,7 @@
old = self._times.get(name, t)
self._seen.add(name)
a = self._ALPHA
- self._times[name] = (a*t) + ((1-a) * old)
+ self._times[name] = (a * t) + ((1 - a) * old)
def _Load(self):
if self._times is None:
@@ -1208,7 +1208,7 @@
if proxy:
proxyhandler = urllib.request.ProxyHandler({
"http": proxy,
- "https": proxy })
+ "https": proxy})
opener = urllib.request.build_opener(
urllib.request.HTTPCookieProcessor(cookiejar),