From: Joel Holdsworth <jholdsworth@nvidia.com>
Date: Fri, 1 Apr 2022 14:25:00 +0000 (+0100)
Subject: git-p4: compare to singletons with "is" and "is not"
X-Git-Tag: v2.37.0-rc0~101^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da0134f6534f407f8377ea97eb040ee6e49412e1;p=thirdparty%2Fgit.git

git-p4: compare to singletons with "is" and "is not"

PEP8 recommends that comparisons with singletons such as None should be
done with "is" and "is not", and never equality operators.

This guideline is described here:
https://www.python.org/dev/peps/pep-0008/#programming-recommendations

Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-p4.py b/git-p4.py
index a25adc8bae..2f2450f7d9 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -857,7 +857,7 @@ def p4Where(depotPath):
             if data[:space] == depotPath:
                 output = entry
                 break
-    if output == None:
+    if output is None:
         return ""
     if output["code"] == "error":
         return ""
@@ -879,7 +879,7 @@ def currentGitBranch():
 
 
 def isValidGitDir(path):
-    return git_dir(path) != None
+    return git_dir(path) is not None
 
 
 def parseRevision(ref):
@@ -4425,7 +4425,7 @@ def main():
     global verbose
     verbose = cmd.verbose
     if cmd.needsGit:
-        if cmd.gitdir == None:
+        if cmd.gitdir is None:
             cmd.gitdir = os.path.abspath(".git")
             if not isValidGitDir(cmd.gitdir):
                 # "rev-parse --git-dir" without arguments will try $PWD/.git