From 3cda50a41b1a950d70be8887c5efe3735586d1bb Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 13 Feb 2020 13:17:03 +0900 Subject: [PATCH] pyflakes: Fix remaining "E501 line too long" warnings We increased the max line length to 100 columns which got rid of the majority of these warnings, but there were still a few lines that exceeded 100 columns. Change-Id: Ib3372868ca2297f83073a14f91c8ae3df9d0d0e6 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254699 Tested-by: David Pursehouse Reviewed-by: Mike Frysinger --- main.py | 3 ++- pager.py | 3 ++- platform_utils_win32.py | 3 ++- subcmds/forall.py | 3 ++- subcmds/gitc_init.py | 3 ++- tests/test_wrapper.py | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index fead2049..abb99cc5 100755 --- a/main.py +++ b/main.py @@ -229,7 +229,8 @@ class _Repo(object): if e.name: print('error: project group must be enabled for project %s' % e.name, file=sys.stderr) else: - print('error: project group must be enabled for the project in the current directory', file=sys.stderr) + print('error: project group must be enabled for the project in the current directory', + file=sys.stderr) result = 1 except SystemExit as e: if e.code: diff --git a/pager.py b/pager.py index 7ad25770..167f003f 100644 --- a/pager.py +++ b/pager.py @@ -59,7 +59,8 @@ def _PipePager(pager): global pager_process, old_stdout, old_stderr assert pager_process is None, "Only one active pager process at a time" # Create pager process, piping stdout/err into its stdin - pager_process = subprocess.Popen([pager], stdin=subprocess.PIPE, stdout=sys.stdout, stderr=sys.stderr) + pager_process = subprocess.Popen([pager], stdin=subprocess.PIPE, stdout=sys.stdout, + stderr=sys.stderr) old_stdout = sys.stdout old_stderr = sys.stderr sys.stdout = pager_process.stdin diff --git a/platform_utils_win32.py b/platform_utils_win32.py index 8eb3d2c3..c59db523 100644 --- a/platform_utils_win32.py +++ b/platform_utils_win32.py @@ -152,7 +152,8 @@ def create_dirsymlink(source, link_name): def _create_symlink(source, link_name, dwFlags): - if not CreateSymbolicLinkW(link_name, source, dwFlags | SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE): + if not CreateSymbolicLinkW(link_name, source, + dwFlags | SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE): # See https://github.com/golang/go/pull/24307/files#diff-b87bc12e4da2497308f9ef746086e4f0 # "the unprivileged create flag is unsupported below Windows 10 (1703, v10.0.14972). # retry without it." diff --git a/subcmds/forall.py b/subcmds/forall.py index dbf26f0b..d0e51920 100644 --- a/subcmds/forall.py +++ b/subcmds/forall.py @@ -127,7 +127,8 @@ without iterating through the remaining projects. help="Execute the command only on projects matching regex or wildcard expression") p.add_option('-i', '--inverse-regex', dest='inverse_regex', action='store_true', - help="Execute the command only on projects not matching regex or wildcard expression") + help="Execute the command only on projects not matching regex or " + "wildcard expression") p.add_option('-g', '--groups', dest='groups', help="Execute the command only on projects matching the specified groups") diff --git a/subcmds/gitc_init.py b/subcmds/gitc_init.py index 378f9236..30a9f7a5 100644 --- a/subcmds/gitc_init.py +++ b/subcmds/gitc_init.py @@ -62,7 +62,8 @@ use for this GITC client. def Execute(self, opt, args): gitc_client = gitc_utils.parse_clientdir(os.getcwd()) if not gitc_client or (opt.gitc_client and gitc_client != opt.gitc_client): - print('fatal: Please update your repo command. See go/gitc for instructions.', file=sys.stderr) + print('fatal: Please update your repo command. See go/gitc for instructions.', + file=sys.stderr) sys.exit(1) self.client_dir = os.path.join(gitc_utils.get_gitc_manifest_dir(), gitc_client) diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py index 61636b26..4d2cf3fb 100644 --- a/tests/test_wrapper.py +++ b/tests/test_wrapper.py @@ -101,7 +101,8 @@ class RepoWrapperUnitTest(RepoWrapperTestCase): self.assertEqual(self.wrapper.gitc_parse_clientdir('/gitc/manifest-rw/test/extra'), 'test') self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test'), 'test') self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test/'), 'test') - self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test/extra'), 'test') + self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/test/extra'), + 'test') self.assertEqual(self.wrapper.gitc_parse_clientdir('/gitc/manifest-rw/'), None) self.assertEqual(self.wrapper.gitc_parse_clientdir('/test/usr/local/google/gitc/'), None)