From: Joel Holdsworth Date: Thu, 10 Feb 2022 16:46:26 GMT Subject: [PATCH v4 21/22] git-p4: seperate multiple statements onto seperate lines Message-ID: <20220210164627.279520-22-jholdsworth@nvidia.com> In-Reply-To: <20220210164627.279520-1-jholdsworth@nvidia.com> PEP8 discourages the use of compound statements where there are multiple statements on a single line in the "Other Recommendations" section: https://www.python.org/dev/peps/pep-0008/#other-recommendations Signed-off-by: Joel Holdsworth --- git-p4.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/git-p4.py b/git-p4.py index 524a7a5c99..c3239cdabc 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1191,7 +1191,8 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize): else: block_size = max(2, block_size // 2) - if verbose: print("block size error, retrying with block size {0}".format(block_size)) + if verbose: + print("block size error, retrying with block size {0}".format(block_size)) continue except P4Exception as e: die('Error retrieving changes description ({0})'.format(e.p4ExitCode)) @@ -1818,7 +1819,9 @@ def modifyChangelistUser(self, changelist, newUser): (changelist, newUser)) c = changes[0] - if c['User'] == newUser: return # nothing to do + if c['User'] == newUser: + # Nothing to do + return c['User'] = newUser # p4 does not understand format version 3 and above input = marshal.dumps(c, 2) -- 2.35.GIT