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 08/20] git-p4: remove padding from lists, tuples and function arguments
Date: Wed, 12 Jan 2022 13:46:23 +0000 [thread overview]
Message-ID: <20220112134635.177877-9-jholdsworth@nvidia.com> (raw)
In-Reply-To: <20220112134635.177877-1-jholdsworth@nvidia.com>
PEP8 discourages use of extraneous padding inside any parenthesis,
brackets or braces in the "Pet Peeves" section:
https://www.python.org/dev/peps/pep-0008/#pet-peeves
This patch removes all cases of these.
Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
---
git-p4.py | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 2f05ec10ca..39c1fb7d4c 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1025,10 +1025,10 @@ def gitDeleteRef(ref):
def gitConfig(key, typeSpecifier=None):
if key not in _gitConfig:
- cmd = [ "git", "config" ]
+ cmd = ["git", "config"]
if typeSpecifier:
- cmd += [ typeSpecifier ]
- cmd += [ key ]
+ cmd += [typeSpecifier]
+ cmd += [key]
s = read_pipe(cmd, ignore_error=True)
_gitConfig[key] = s.strip()
return _gitConfig[key]
@@ -1047,7 +1047,7 @@ def gitConfigBool(key):
def gitConfigInt(key):
if key not in _gitConfig:
- cmd = [ "git", "config", "--int", key ]
+ cmd = ["git", "config", "--int", key]
s = read_pipe(cmd, ignore_error=True)
v = s.strip()
try:
@@ -1103,7 +1103,7 @@ def p4BranchesInGit(branchesAreInRemotes=True):
def branch_exists(branch):
"""Make sure that the given ref name really exists."""
- cmd = [ "git", "rev-parse", "--symbolic", "--verify", branch ]
+ cmd = ["git", "rev-parse", "--symbolic", "--verify", branch]
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, _ = p.communicate()
out = decode_text_stream(out)
@@ -1319,7 +1319,7 @@ def getClientSpec():
client_name = entry["Client"]
# just the keys that start with "View"
- view_keys = [ k for k in entry.keys() if k.startswith("View") ]
+ view_keys = [k for k in entry.keys() if k.startswith("View")]
# hold this new View
view = View(client_name)
@@ -1585,8 +1585,8 @@ def processContent(self, git_mode, relPath, contents):
class Command:
- delete_actions = ( "delete", "move/delete", "purge" )
- add_actions = ( "add", "branch", "move/add" )
+ delete_actions = ("delete", "move/delete", "purge")
+ add_actions = ("add", "branch", "move/add")
def __init__(self):
self.usage = "usage: %prog [options]"
@@ -2593,7 +2593,7 @@ def run(self, args):
sys.exit(1)
except Exception as e:
print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed "\
- "with the error '{0}'".format(e.message) )
+ "with the error '{0}'".format(e.message))
sys.exit(1)
#
@@ -2798,7 +2798,7 @@ def map_in_client(self, depot_path):
if depot_path in self.client_spec_path_cache:
return self.client_spec_path_cache[depot_path]
- die( "Error: %s is not found in client spec path" % depot_path )
+ die("Error: %s is not found in client spec path" % depot_path)
return ""
@@ -3093,7 +3093,7 @@ def streamOneP4File(self, file, contents):
else:
if p4_version_string().find('/NT') >= 0:
text = text.replace(b'\r\n', b'\n')
- contents = [ text ]
+ contents = [text]
if type_base == "apple":
# Apple filetype files will be streamed as a concatenation of
@@ -3717,7 +3717,7 @@ def importChanges(self, changes, origin_revision=0):
for branch in branches.keys():
## HACK --hwn
branchPrefix = self.depotPaths[0] + branch + "/"
- self.branchPrefixes = [ branchPrefix ]
+ self.branchPrefixes = [branchPrefix]
parent = ""
@@ -3825,7 +3825,7 @@ def importHeadRevision(self, revision):
if info["action"] in self.delete_actions:
continue
- for prop in ["depotFile", "rev", "action", "type" ]:
+ for prop in ["depotFile", "rev", "action", "type"]:
details["%s%s" % (prop, fileCnt)] = info[prop]
fileCnt = fileCnt + 1
@@ -3978,7 +3978,7 @@ def run(self, args):
if branch_arg_given:
short = self.branch.split("/")[-1]
if short in branches:
- self.p4BranchesInGit = [ short ]
+ self.p4BranchesInGit = [short]
else:
self.p4BranchesInGit = branches.keys()
@@ -4259,7 +4259,7 @@ def run(self, args):
os.makedirs(self.cloneDestination)
chdir(self.cloneDestination)
- init_cmd = [ "git", "init" ]
+ init_cmd = ["git", "init"]
if self.cloneBare:
init_cmd.append("--bare")
retcode = subprocess.call(init_cmd)
@@ -4271,9 +4271,9 @@ def run(self, args):
# create a master branch and check out a work tree
if gitBranchExists(self.branch):
- system([ "git", "branch", currentGitBranch(), self.branch ])
+ system(["git", "branch", currentGitBranch(), self.branch])
if not self.cloneBare:
- system([ "git", "checkout", "-f" ])
+ system(["git", "checkout", "-f"])
else:
print('Not checking out any branch, use ' \
'"git checkout -q -b master <branch>"')
@@ -4404,7 +4404,7 @@ def run(self, args):
class P4Branches(Command):
def __init__(self):
Command.__init__(self)
- self.options = [ ]
+ self.options = []
self.description = ("Shows the git branches that hold imports and their "
+ "corresponding perforce depot paths")
self.verbose = False
--
2.34.1
next prev parent reply other threads:[~2022-01-12 13:48 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-12 13:46 [PATCH 00/20] git-p4: Various code tidy-ups Joel Holdsworth
2022-01-12 13:46 ` [PATCH 01/20] git-p4: add blank lines between functions and class definitions Joel Holdsworth
2022-01-12 13:46 ` [PATCH 02/20] git-p4: remove unneeded semicolons from statements Joel Holdsworth
2022-01-12 13:46 ` [PATCH 03/20] git-p4: indent with 4-spaces Joel Holdsworth
2022-01-12 13:46 ` [PATCH 04/20] git-p4: improve consistency of docstring formatting Joel Holdsworth
2022-01-12 19:20 ` Eric Sunshine
2022-01-12 13:46 ` [PATCH 05/20] git-p4: convert descriptive class and function comments into docstrings Joel Holdsworth
2022-01-12 19:31 ` Eric Sunshine
2022-01-12 13:46 ` [PATCH 06/20] git-p4: remove commented code Joel Holdsworth
2022-01-12 19:33 ` Eric Sunshine
2022-01-12 13:46 ` [PATCH 07/20] git-p4: sort and de-duplcate pylint disable list Joel Holdsworth
2022-01-12 13:46 ` Joel Holdsworth [this message]
2022-01-12 13:46 ` [PATCH 09/20] git-p4: remove spaces around default arguments Joel Holdsworth
2022-01-12 13:46 ` [PATCH 10/20] git-p4: place a single space after every comma Joel Holdsworth
2022-01-12 19:41 ` Eric Sunshine
2022-01-12 13:46 ` [PATCH 11/20] git-p4: remove extraneous spaces before function arguments Joel Holdsworth
2022-01-12 13:46 ` [PATCH 12/20] git-p4: remove redundant backslash-continuations inside brackets Joel Holdsworth
2022-01-12 13:46 ` [PATCH 13/20] git-p4: remove spaces between dictionary keys and colons Joel Holdsworth
2022-01-12 13:46 ` [PATCH 14/20] git-p4: ensure every comment has a single # Joel Holdsworth
2022-01-12 13:46 ` [PATCH 15/20] git-p4: ensure there is a single space around all operators Joel Holdsworth
2022-01-12 13:46 ` [PATCH 16/20] git-p4: tidied visual indented lines of conditionals Joel Holdsworth
2022-01-12 19:46 ` Eric Sunshine
2022-01-12 13:46 ` [PATCH 17/20] git-p4: compare to singletons with "is" and "is not" Joel Holdsworth
2022-01-12 19:54 ` Eric Sunshine
2022-01-12 13:46 ` [PATCH 18/20] git-p4: only seperate code blocks by a single empty line Joel Holdsworth
2022-01-12 13:46 ` [PATCH 19/20] git-p4: move inline comments to line above Joel Holdsworth
2022-01-12 13:46 ` [PATCH 20/20] git-p4: seperate multiple statements onto seperate lines 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=20220112134635.177877-9-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).