diff --git a/git-p4.py b/git-p4.py index f8d07cfd7f..0353bca289 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1040,7 +1040,7 @@ def branch_exists(branch): return out.rstrip() == branch -def findUpstreamBranchPoint(head = "HEAD"): +def findUpstreamBranchPoint(head="HEAD"): branches = p4BranchesInGit() # map from depot-path to branch name branchByDepotPath = {} @@ -1068,7 +1068,7 @@ def findUpstreamBranchPoint(head = "HEAD"): return ["", settings] -def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent=True): +def createOrUpdateBranchesFromOrigin(localRefPrefix="refs/remotes/p4/", silent=True): if not silent: print("Creating/updating branch(es) in %s based on origin branch(es)" % localRefPrefix) @@ -2838,7 +2838,7 @@ class P4Sync(Command, P4UserMap): return True return False - def extractFilesFromCommit(self, commit, shelved=False, shelved_cl = 0): + def extractFilesFromCommit(self, commit, shelved=False, shelved_cl=0): files = [] fnum = 0 while "depotFile%s" % fnum in commit: @@ -3269,7 +3269,7 @@ class P4Sync(Command, P4UserMap): 'rev': record['headRev'], 'type': record['headType']}) - def commit(self, details, files, branch, parent = "", allow_empty=False): + def commit(self, details, files, branch, parent="", allow_empty=False): epoch = details["time"] author = details["user"] jobs = self.extractJobsFromCommit(details) @@ -4415,8 +4415,8 @@ def main(): parser = optparse.OptionParser(cmd.usage.replace("%prog", "%prog " + cmdName), options, - description = cmd.description, - formatter = HelpFormatter()) + description=cmd.description, + formatter=HelpFormatter()) try: (cmd, args) = parser.parse_args(sys.argv[2:], cmd)