git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 20/20] git-p4: seperate multiple statements onto seperate lines

From
Joel Holdsworth <jholdsworth@nvidia.com>
Date
Jan 12, 2022, 13:46 UTC
Message-ID
<20220112134635.177877-21-jholdsworth@nvidia.com>
In-Reply-To
<20220112134635.177877-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 679667611c..cd7ecb7aeb 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
Previous: Joel Holdsworth
Message 27 of 27 in “git-p4: Various code tidy-ups”
  1. 00/20 git-p4: Various code tidy-upsJoel Holdsworth, Jan 12, 2022
  2. 01/20 git-p4: add blank lines between functions and class definitionsJoel Holdsworth, Jan 12, 2022
  3. 02/20 git-p4: remove unneeded semicolons from statementsJoel Holdsworth, Jan 12, 2022
  4. 03/20 git-p4: indent with 4-spacesJoel Holdsworth, Jan 12, 2022
  5. 04/20 git-p4: improve consistency of docstring formattingJoel Holdsworth, Jan 12, 2022
  6. Eric SunshineJan 12, 2022
  7. 05/20 git-p4: convert descriptive class and function comments into docstringsJoel Holdsworth, Jan 12, 2022
  8. Eric SunshineJan 12, 2022
  9. 06/20 git-p4: remove commented codeJoel Holdsworth, Jan 12, 2022
  10. Eric SunshineJan 12, 2022
  11. 09/20 git-p4: remove spaces around default argumentsJoel Holdsworth, Jan 12, 2022
  12. 07/20 git-p4: sort and de-duplcate pylint disable listJoel Holdsworth, Jan 12, 2022
  13. 08/20 git-p4: remove padding from lists, tuples and function argumentsJoel Holdsworth, Jan 12, 2022
  14. 10/20 git-p4: place a single space after every commaJoel Holdsworth, Jan 12, 2022
  15. Eric SunshineJan 12, 2022
  16. 16/20 git-p4: tidied visual indented lines of conditionalsJoel Holdsworth, Jan 12, 2022
  17. Eric SunshineJan 12, 2022
  18. 11/20 git-p4: remove extraneous spaces before function argumentsJoel Holdsworth, Jan 12, 2022
  19. 12/20 git-p4: remove redundant backslash-continuations inside bracketsJoel Holdsworth, Jan 12, 2022
  20. 13/20 git-p4: remove spaces between dictionary keys and colonsJoel Holdsworth, Jan 12, 2022
  21. 14/20 git-p4: ensure every comment has a single #Joel Holdsworth, Jan 12, 2022
  22. 17/20 git-p4: compare to singletons with "is" and "is not"Joel Holdsworth, Jan 12, 2022
  23. Eric SunshineJan 12, 2022
  24. 15/20 git-p4: ensure there is a single space around all operatorsJoel Holdsworth, Jan 12, 2022
  25. 18/20 git-p4: only seperate code blocks by a single empty lineJoel Holdsworth, Jan 12, 2022
  26. 19/20 git-p4: move inline comments to line aboveJoel Holdsworth, Jan 12, 2022
  27. 20/20 git-p4: seperate multiple statements onto seperate linesJoel Holdsworth, Jan 12, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.