From: Joel Holdsworth Date: Sun, 16 Jan 2022 16:05:50 GMT Subject: [PATCH v3 21/21] git-p4: seperate multiple statements onto seperate lines Message-ID: <20220116160550.514637-22-jholdsworth@nvidia.com> In-Reply-To: <20220116160550.514637-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 4d291d0870..4d2f2f54c7 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1249,7 +1249,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)) @@ -1876,7 +1877,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.34.1