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 v3 10/21] git-p4: removed brackets when assigning multiple return values
Date: Sun, 16 Jan 2022 16:05:39 +0000 [thread overview]
Message-ID: <20220116160550.514637-11-jholdsworth@nvidia.com> (raw)
In-Reply-To: <20220116160550.514637-1-jholdsworth@nvidia.com>
In several places, git-p4 contains code of the form:
(a, b) = foo()
In each case, multiple values are returned through a tuple or a list and
bound into multiple values.
The brackets around the assigned variables are redundant and can be
removed:
a, b = foo()
Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
---
git-p4.py | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 534f260e9f..385ad98384 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -300,7 +300,7 @@ def run_hook_command(cmd, param):
cli = [cmd] + param
use_shell = False
if platform.system() == 'Windows':
- (root,ext) = os.path.splitext(cmd)
+ root, ext = os.path.splitext(cmd)
if ext == "":
exe_path = os.environ.get("EXEPATH")
if exe_path is None:
@@ -343,7 +343,7 @@ def read_pipe_full(c, *k, **kw):
p = subprocess.Popen(
c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, *k, **kw)
- (out, err) = p.communicate()
+ out, err = p.communicate()
return (p.returncode, out, decode_text_stream(err))
@@ -354,7 +354,7 @@ def read_pipe(c, ignore_error=False, raw=False, *k, **kw):
If raw is True, do not attempt to decode output text.
"""
- (retcode, out, err) = read_pipe_full(c, *k, **kw)
+ retcode, out, err = read_pipe_full(c, *k, **kw)
if retcode != 0:
if ignore_error:
out = ""
@@ -369,7 +369,7 @@ def read_pipe_text(c, *k, **kw):
"""Read output from a command with trailing whitespace stripped. On error,
returns None.
"""
- (retcode, out, err) = read_pipe_full(c, *k, **kw)
+ retcode, out, err = read_pipe_full(c, *k, **kw)
if retcode != 0:
return None
else:
@@ -423,7 +423,7 @@ def p4_has_move_command():
return False
cmd = p4_build_cmd(["move", "-k", "@from", "@to"])
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- (out, err) = p.communicate()
+ out, err = p.communicate()
err = decode_text_stream(err)
# return code will be 1 in either case
if err.find("Invalid option") >= 0:
@@ -664,7 +664,7 @@ def p4_keywords_regexp_for_file(file):
if not os.path.exists(file):
return None
else:
- (type_base, type_mods) = split_p4_type(p4_type(file))
+ type_base, type_mods = split_p4_type(p4_type(file))
return p4_keywords_regexp_for_type(type_base, type_mods)
@@ -1212,7 +1212,7 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
parts = changeRange.split(',')
assert len(parts) == 2
try:
- (changeStart, changeEnd) = p4ParseNumericChangeRange(parts)
+ changeStart, changeEnd = p4ParseNumericChangeRange(parts)
block_size = chooseBlockSize(requestedBlockSize)
except ValueError:
changeStart = parts[0][1:]
@@ -1437,7 +1437,7 @@ def processContent(self, git_mode, relPath, contents):
"""
if self.exceedsLargeFileThreshold(relPath, contents) or self.hasLargeFileExtension(relPath):
contentTempFile = self.generateTempFile(contents)
- (pointer_git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile)
+ pointer_git_mode, contents, localLargeFile = self.generatePointer(contentTempFile)
if pointer_git_mode:
git_mode = pointer_git_mode
if localLargeFile:
@@ -1808,7 +1808,7 @@ def patchRCSKeywords(self, file, regexp):
"""Attempt to zap the RCS keywords in a p4 controlled file matching the
given regex.
"""
- (handle, outFileName) = tempfile.mkstemp(dir='.')
+ handle, outFileName = tempfile.mkstemp(dir='.')
try:
with os.fdopen(handle, "wb") as outFile, open(file, "rb") as inFile:
for line in inFile.readlines():
@@ -1840,7 +1840,7 @@ def p4UserForCommit(self,id):
def checkValidP4Users(self,commits):
"""Check if any git authors cannot be mapped to p4 users."""
for id in commits:
- (user,email) = self.p4UserForCommit(id)
+ user, email = self.p4UserForCommit(id)
if not user:
msg = "Cannot find p4 user for email %s in commit %s." % (email, id)
if gitConfigBool("git-p4.allowMissingP4Users"):
@@ -1915,7 +1915,7 @@ def prepareSubmitTemplate(self, changelist=None):
outside the depot path we're committing into.
"""
- [upstream, settings] = findUpstreamBranchPoint()
+ upstream, settings = findUpstreamBranchPoint()
template = """\
# A Perforce Change Specification.
@@ -2049,7 +2049,7 @@ def applyCommit(self, id):
print("Applying", read_pipe(["git", "show", "-s",
"--format=format:%h %s", id]))
- (p4User, gitEmail) = self.p4UserForCommit(id)
+ p4User, gitEmail = self.p4UserForCommit(id)
diff = read_pipe_lines(
["git", "diff-tree", "-r"] + self.diffOpts + ["{}^".format(id), id])
@@ -2214,7 +2214,7 @@ def applyCommit(self, id):
#
logMessage = extractLogMessageFromGitCommit(id)
logMessage = logMessage.strip()
- (logMessage, jobs) = self.separate_jobs_from_description(logMessage)
+ logMessage, jobs = self.separate_jobs_from_description(logMessage)
template = self.prepareSubmitTemplate(update_shelve)
submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
@@ -2232,7 +2232,7 @@ def applyCommit(self, id):
submitTemplate += separatorLine
submitTemplate += self.get_diff_description(editedFiles, filesToAdd, symlinks)
- (handle, fileName) = tempfile.mkstemp()
+ handle, fileName = tempfile.mkstemp()
tmpFile = os.fdopen(handle, "w+b")
if self.isWindows:
submitTemplate = submitTemplate.replace("\n", "\r\n")
@@ -2439,7 +2439,7 @@ def run(self, args):
if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
die("%s is not in git-p4.allowSubmit" % self.master)
- [upstream, settings] = findUpstreamBranchPoint()
+ upstream, settings = findUpstreamBranchPoint()
self.depotPath = settings['depot-paths'][0]
if len(self.origin) == 0:
self.origin = upstream
@@ -3039,7 +3039,7 @@ def streamOneP4File(self, file, contents):
file_path, relPath, format_size_human_readable(size)))
sys.stdout.flush()
- (type_base, type_mods) = split_p4_type(file["type"])
+ type_base, type_mods = split_p4_type(file["type"])
git_mode = "100644"
if "x" in type_mods:
@@ -3104,7 +3104,7 @@ def streamOneP4File(self, file, contents):
contents = [regexp.sub(br'$\1$', c) for c in contents]
if self.largeFileSystem:
- (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)
+ git_mode, contents = self.largeFileSystem.processContent(git_mode, relPath, contents)
self.writeToGitStream(git_mode, relPath, contents)
@@ -3572,7 +3572,7 @@ def getBranchMapping(self):
configBranches = gitConfigList("git-p4.branchList")
for branch in configBranches:
if branch:
- (source, destination) = branch.split(":")
+ source, destination = branch.split(":")
self.knownBranches[destination] = source
lostAndFoundBranches.discard(destination)
@@ -4180,7 +4180,7 @@ def rebase(self):
if len(read_pipe("git diff-index HEAD --")) > 0:
die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.")
- [upstream, settings] = findUpstreamBranchPoint()
+ upstream, settings = findUpstreamBranchPoint()
if len(upstream) == 0:
die("Cannot find upstream branchpoint for rebase")
@@ -4477,7 +4477,7 @@ def main():
formatter=HelpFormatter())
try:
- (cmd, args) = parser.parse_args(sys.argv[2:], cmd)
+ cmd, args = parser.parse_args(sys.argv[2:], cmd)
except:
parser.print_help()
raise
--
2.34.1
next prev parent reply other threads:[~2022-01-16 16:07 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-16 16:05 [PATCH v3 00/21] git-p4: Various code tidy-ups Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 01/21] git-p4: add blank lines between functions and class definitions Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 02/21] git-p4: remove unneeded semicolons from statements Joel Holdsworth
2022-01-17 2:19 ` Junio C Hamano
2022-01-16 16:05 ` [PATCH v3 03/21] git-p4: indent with 4-spaces Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 04/21] git-p4: improve consistency of docstring formatting Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 05/21] git-p4: convert descriptive class and function comments into docstrings Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 06/21] git-p4: remove commented code Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 07/21] git-p4: sort and de-duplcate pylint disable list Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 08/21] git-p4: remove padding from lists, tuples and function arguments Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 09/21] git-p4: remove spaces around default arguments Joel Holdsworth
2022-01-16 16:05 ` Joel Holdsworth [this message]
2022-01-16 16:05 ` [PATCH v3 11/21] git-p4: place a single space after every comma Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 12/21] git-p4: remove extraneous spaces before function arguments Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 13/21] git-p4: remove redundant backslash-continuations inside brackets Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 14/21] git-p4: remove spaces between dictionary keys and colons Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 15/21] git-p4: ensure every comment has a single # Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 16/21] git-p4: ensure there is a single space around all operators Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 17/21] git-p4: normalize indentation of lines in conditionals Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 18/21] git-p4: compare to singletons with "is" and "is not" Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 19/21] git-p4: only seperate code blocks by a single empty line Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 20/21] git-p4: move inline comments to line above Joel Holdsworth
2022-01-16 16:05 ` [PATCH v3 21/21] git-p4: seperate multiple statements onto seperate lines Joel Holdsworth
2022-01-17 1:34 ` [PATCH v3 00/21] git-p4: Various code tidy-ups Junio C Hamano
2022-02-03 21:22 ` Joel Holdsworth
2022-02-03 21:30 ` Junio C Hamano
2022-02-04 12:27 ` Joel Holdsworth
2022-02-04 17:16 ` Junio C Hamano
2022-01-17 2:22 ` Junio C Hamano
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=20220116160550.514637-11-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).