From: Joel Holdsworth <jholdsworth@nvidia.com>
To: git@vger.kernel.org, Luke Diamand <luke@diamand.org>,
Junio C Hamano <gitster@pobox.com>,
Eric Sunshine <sunshine@sunshineco.com>
Cc: Tzadik Vanderhoof <tzadik.vanderhoof@gmail.com>,
Dorgon Chang <dorgonman@hotmail.com>,
Joachim Kuebart <joachim.kuebart@gmail.com>,
Daniel Levin <dendy.ua@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Ben Keene <seraphire@gmail.com>,
Andrew Oakley <andrew@adoakley.name>,
Joel Holdsworth <jholdsworth@nvidia.com>
Subject: [PATCH v2 21/21] git-p4: seperate multiple statements onto seperate lines
Date: Thu, 13 Jan 2022 13:47:28 +0000 [thread overview]
Message-ID: <20220113134728.23192-22-jholdsworth@nvidia.com> (raw)
In-Reply-To: <20220113134728.23192-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 <jholdsworth@nvidia.com>
---
git-p4.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 7789989ec7..7cdc98dfa6 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1264,7 +1264,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))
@@ -1891,7 +1892,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
next prev parent reply other threads:[~2022-01-13 13:49 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-13 13:47 [PATCH v2 00/21] git-p4: Various code tidy-ups Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 01/21] git-p4: add blank lines between functions and class definitions Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 02/21] git-p4: remove unneeded semicolons from statements Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 03/21] git-p4: indent with 4-spaces Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 04/21] git-p4: improve consistency of docstring formatting Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 05/21] git-p4: convert descriptive class and function comments into docstrings Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 06/21] git-p4: remove commented code Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 07/21] git-p4: sort and de-duplcate pylint disable list Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 08/21] git-p4: remove padding from lists, tuples and function arguments Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 09/21] git-p4: remove spaces around default arguments Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 10/21] git-p4: removed brackets when assigning multiple return values Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 11/21] git-p4: place a single space after every comma Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 12/21] git-p4: remove extraneous spaces before function arguments Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 13/21] git-p4: remove redundant backslash-continuations inside brackets Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 14/21] git-p4: remove spaces between dictionary keys and colons Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 15/21] git-p4: ensure every comment has a single # Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 16/21] git-p4: ensure there is a single space around all operators Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 17/21] git-p4: normalize indentation of lines in conditionals Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 18/21] git-p4: compare to singletons with "is" and "is not" Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 19/21] git-p4: only seperate code blocks by a single empty line Joel Holdsworth
2022-01-13 13:47 ` [PATCH v2 20/21] git-p4: move inline comments to line above Joel Holdsworth
2022-01-13 13:47 ` Joel Holdsworth [this message]
2022-01-13 23:03 ` [PATCH v2 00/21] git-p4: Various code tidy-ups Junio C Hamano
2022-01-14 18:32 ` Joel Holdsworth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220113134728.23192-22-jholdsworth@nvidia.com \
--to=jholdsworth@nvidia.com \
--cc=andrew@adoakley.name \
--cc=dendy.ua@gmail.com \
--cc=dorgonman@hotmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=joachim.kuebart@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=luke@diamand.org \
--cc=seraphire@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=tzadik.vanderhoof@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).