From: Joel Holdsworth Date: Fri, 1 Apr 2022 14:24:54 +0000 (+0100) Subject: git-p4: remove extraneous spaces before function arguments X-Git-Tag: v2.37.0-rc0~101^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=843d847ff75f76bc9cba89bf2bf1162906f1f6be;p=thirdparty%2Fgit.git git-p4: remove extraneous spaces before function arguments PEP8 recommends that there should be no spaces before function arguments in the in the "Pet Peeves" section: https://www.python.org/dev/peps/pep-0008/#pet-peeves Signed-off-by: Joel Holdsworth Signed-off-by: Junio C Hamano --- diff --git a/git-p4.py b/git-p4.py index c9081d79ac..862dc4ca00 100755 --- a/git-p4.py +++ b/git-p4.py @@ -911,16 +911,16 @@ def extractSettingsGitLog(log): values = {} for line in log.split("\n"): line = line.strip() - m = re.search (r"^ *\[git-p4: (.*)\]$", line) + m = re.search(r"^ *\[git-p4: (.*)\]$", line) if not m: continue - assignments = m.group(1).split (':') + assignments = m.group(1).split(':') for a in assignments: - vals = a.split ('=') + vals = a.split('=') key = vals[0].strip() - val = ('='.join (vals[1:])).strip() - if val.endswith ('\"') and val.startswith('"'): + val = ('='.join(vals[1:])).strip() + if val.endswith('\"') and val.startswith('"'): val = val[1:-1] values[key] = val @@ -2275,9 +2275,9 @@ class P4Submit(Command, P4UserMap): # Revert changes if we skip this patch if not submitted or self.shelve: if self.shelve: - print ("Reverting shelved files.") + print("Reverting shelved files.") else: - print ("Submission cancelled, undoing p4 changes.") + print("Submission cancelled, undoing p4 changes.") sys.stdout.flush() for f in editedFiles | filesToDelete: p4_revert(f) @@ -3948,7 +3948,7 @@ class P4Sync(Command, P4UserMap): i = i - 1 break - paths.append ("/".join(cur_list[:i + 1])) + paths.append("/".join(cur_list[:i + 1])) self.previousDepotPaths = paths @@ -3977,8 +3977,8 @@ class P4Sync(Command, P4UserMap): else: if self.depotPaths and self.depotPaths != args: print("previous import used depot path %s and now %s was specified. " - "This doesn't work!" % (' '.join (self.depotPaths), - ' '.join (args))) + "This doesn't work!" % (' '.join(self.depotPaths), + ' '.join(args))) sys.exit(1) self.depotPaths = sorted(args) @@ -4018,7 +4018,7 @@ class P4Sync(Command, P4UserMap): if len(self.changesFile) == 0: revision = "#head" - p = re.sub ("\.\.\.$", "", p) + p = re.sub("\.\.\.$", "", p) if not p.endswith("/"): p += "/"