commit 78e82ec78e9bd4677c2e1f941b046d126f2f0ba7
author Sergiy Belozorov <sergiyb@chromium.org> Thu Jan 05 18:57:31 2023 +0100
committer Sergiy Belozorov <sergiyb@chromium.org> Thu Jan 05 18:43:12 2023 +0000
tree 31c8301dd3c4a49aebc1434fe4bea497e4b9eb78
parent 37ae75f27dcf1505a991fe6da70b9f28f29709d6

Fix flake8 warnings for some files

Change-Id: If67f8660cfb0479f0e710b3566285ef401fcf077
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/355969
Tested-by: Sergiy Belozorov <sergiyb@chromium.org>
Reviewed-by: Mike Frysinger <vapier@google.com>

git_command.py

diff --git a/git_command.py b/git_command.py
index 3a3bb34..d4d4bed 100644
--- a/git_command.py
+++ b/git_command.py
@@ -159,12 +159,12 @@
 
 
 def _build_env(
-  _kwargs_only=(),
-  bare: Optional[bool] = False,
-  disable_editor: Optional[bool] = False,
-  ssh_proxy: Optional[Any] = None,
-  gitdir: Optional[str] = None,
-  objdir: Optional[str] = None
+    _kwargs_only=(),
+    bare: Optional[bool] = False,
+    disable_editor: Optional[bool] = False,
+    ssh_proxy: Optional[Any] = None,
+    gitdir: Optional[str] = None,
+    objdir: Optional[str] = None
 ):
   """Constucts an env dict for command execution."""
 
@@ -194,8 +194,7 @@
     env['GIT_OBJECT_DIRECTORY'] = objdir
 
     alt_objects = os.path.join(gitdir, 'objects') if gitdir else None
-    if (alt_objects and
-        os.path.realpath(alt_objects) != os.path.realpath(objdir)):
+    if alt_objects and os.path.realpath(alt_objects) != os.path.realpath(objdir):
       # Allow git to search the original place in case of local or unique refs
       # that git will attempt to resolve even if we aren't fetching them.
       env['GIT_ALTERNATE_OBJECT_DIRECTORIES'] = alt_objects
@@ -236,11 +235,11 @@
         gitdir = gitdir.replace('\\', '/')
 
     env = _build_env(
-      disable_editor=disable_editor,
-      ssh_proxy=ssh_proxy,
-      objdir=objdir,
-      gitdir=gitdir,
-      bare=bare,
+        disable_editor=disable_editor,
+        ssh_proxy=ssh_proxy,
+        objdir=objdir,
+        gitdir=gitdir,
+        bare=bare,
     )
 
     command = [GIT]
@@ -279,7 +278,8 @@
       if 'GIT_OBJECT_DIRECTORY' in env:
         dbg += ': export GIT_OBJECT_DIRECTORY=%s\n' % env['GIT_OBJECT_DIRECTORY']
       if 'GIT_ALTERNATE_OBJECT_DIRECTORIES' in env:
-        dbg += ': export GIT_ALTERNATE_OBJECT_DIRECTORIES=%s\n' % env['GIT_ALTERNATE_OBJECT_DIRECTORIES']
+        dbg += ': export GIT_ALTERNATE_OBJECT_DIRECTORIES=%s\n' % (
+            env['GIT_ALTERNATE_OBJECT_DIRECTORIES'])
 
       dbg += ': '
       dbg += ' '.join(command)
@@ -295,13 +295,13 @@
     with Trace('git command %s %s with debug: %s', LAST_GITDIR, command, dbg):
       try:
         p = subprocess.Popen(command,
-                            cwd=cwd,
-                            env=env,
-                            encoding='utf-8',
-                            errors='backslashreplace',
-                            stdin=stdin,
-                            stdout=stdout,
-                            stderr=stderr)
+                             cwd=cwd,
+                             env=env,
+                             encoding='utf-8',
+                             errors='backslashreplace',
+                             stdin=stdin,
+                             stdout=stdout,
+                             stderr=stderr)
       except Exception as e:
         raise GitError('%s: %s' % (command[1], e))