From 78e82ec78e9bd4677c2e1f941b046d126f2f0ba7 Mon Sep 17 00:00:00 2001 From: Sergiy Belozorov Date: Thu, 5 Jan 2023 18:57:31 +0100 Subject: Fix flake8 warnings for some files Change-Id: If67f8660cfb0479f0e710b3566285ef401fcf077 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/355969 Tested-by: Sergiy Belozorov Reviewed-by: Mike Frysinger --- git_command.py | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'git_command.py') diff --git a/git_command.py b/git_command.py index 3a3bb34d..d4d4bed4 100644 --- a/git_command.py +++ b/git_command.py @@ -159,12 +159,12 @@ def git_require(min_version, fail=False, msg=''): 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 @@ def _build_env( 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 @@ class GitCommand(object): 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 @@ class GitCommand(object): 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 @@ class GitCommand(object): 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)) -- cgit v1.2.3-54-g00ecf