Fix blank line issues reported by flake8
- E301 expected 1 blank line
- E302 expected 2 blank lines
- E303 too many blank lines
- E305 expected 2 blank lines after class or function definition
- E306 expected 1 blank line before a nested definition
Fixed automatically with autopep8:
git ls-files | grep py$ | xargs autopep8 --in-place \
--select E301,E302,E303,E305,E306
Manually fix issues in project.py caused by misuse of block comments.
Change-Id: Iee840fcaff48aae504ddac9c3e76d2acd484f6a9
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254599
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: David Pursehouse <dpursehouse@collab.net>
diff --git a/main.py b/main.py
index 7724a76..d2a303c 100755
--- a/main.py
+++ b/main.py
@@ -101,6 +101,7 @@
dest='event_log', action='store',
help='filename of event log to append timeline to')
+
class _Repo(object):
def __init__(self, repodir):
self.repodir = repodir
@@ -300,11 +301,13 @@
cp %s %s
""" % (exp_str, WrapperPath(), repo_path), file=sys.stderr)
+
def _CheckRepoDir(repo_dir):
if not repo_dir:
print('no --repo-dir argument', file=sys.stderr)
sys.exit(1)
+
def _PruneOptions(argv, opt):
i = 0
while i < len(argv):
@@ -320,6 +323,7 @@
continue
i += 1
+
class _UserAgentHandler(urllib.request.BaseHandler):
def http_request(self, req):
req.add_header('User-Agent', user_agent.repo)
@@ -329,6 +333,7 @@
req.add_header('User-Agent', user_agent.repo)
return req
+
def _AddPasswordFromUserInput(handler, msg, req):
# If repo could not find auth info from netrc, try to get it from user input
url = req.get_full_url()
@@ -342,6 +347,7 @@
return
handler.passwd.add_password(None, url, user, password)
+
class _BasicAuthHandler(urllib.request.HTTPBasicAuthHandler):
def http_error_401(self, req, fp, code, msg, headers):
_AddPasswordFromUserInput(self, msg, req)
@@ -351,6 +357,7 @@
def http_error_auth_reqed(self, authreq, host, req, headers):
try:
old_add_header = req.add_header
+
def _add_header(name, val):
val = val.replace('\n', '')
old_add_header(name, val)
@@ -365,6 +372,7 @@
self.retried = 0
raise
+
class _DigestAuthHandler(urllib.request.HTTPDigestAuthHandler):
def http_error_401(self, req, fp, code, msg, headers):
_AddPasswordFromUserInput(self, msg, req)
@@ -374,6 +382,7 @@
def http_error_auth_reqed(self, auth_header, host, req, headers):
try:
old_add_header = req.add_header
+
def _add_header(name, val):
val = val.replace('\n', '')
old_add_header(name, val)
@@ -388,6 +397,7 @@
self.retried = 0
raise
+
class _KerberosAuthHandler(urllib.request.BaseHandler):
def __init__(self):
self.retried = 0
@@ -468,6 +478,7 @@
kerberos.authGSSClientClean(self.context)
self.context = None
+
def init_http():
handlers = [_UserAgentHandler()]
@@ -495,6 +506,7 @@
handlers.append(urllib.request.HTTPSHandler(debuglevel=1))
urllib.request.install_opener(urllib.request.build_opener(*handlers))
+
def _Main(argv):
result = 0
@@ -551,5 +563,6 @@
TerminatePager()
sys.exit(result)
+
if __name__ == '__main__':
_Main(sys.argv[1:])