[llvm] r283088 - [lit] Compare to None using identity, not equality

Chris Bieneman via llvm-commits llvm-commits at lists.llvm.org
Sun Oct 2 21:48:13 PDT 2016


Author: cbieneman
Date: Sun Oct  2 23:48:13 2016
New Revision: 283088

URL: http://llvm.org/viewvc/llvm-project?rev=283088&view=rev
Log:
[lit] Compare to None using identity, not equality

Summary:
In Python, `None` is a singleton, so checking whether a variable is
`None` may be done with `is` or `is not`. This has a slight advantage
over equiality comparisons `== None` and `!= None`, since `__eq__` may
be overridden in Python to produce sometimes unexpected results.

Using `is None` and `is not None` is also recommended practice in
https://www.python.org/dev/peps/pep-0008:

> Comparisons to singletons like `None` should always be done with `is` or
> `is not`, never the equality operators.

Patch by Brian Gesiak!

Reviewers: ddunbar, echristo, beanz

Subscribers: llvm-commits, mehdi_amini

Differential Revision: https://reviews.llvm.org/D25168

Modified:
    llvm/trunk/utils/lit/lit/TestRunner.py
    llvm/trunk/utils/lit/lit/main.py

Modified: llvm/trunk/utils/lit/lit/TestRunner.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/TestRunner.py?rev=283088&r1=283087&r2=283088&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/TestRunner.py (original)
+++ llvm/trunk/utils/lit/lit/TestRunner.py Sun Oct  2 23:48:13 2016
@@ -406,7 +406,7 @@ def _executeShCmd(cmd, shenv, results, t
                             data = f.read()
                     except:
                         data = None
-                    if data != None:
+                    if data is not None:
                         output_files.append((name, path, data))
             
         results.append(ShellCommandResult(
@@ -786,7 +786,7 @@ def _runShTest(test, litConfig, useExter
     if exitCode == 0:
         status = Test.PASS
     else:
-        if timeoutInfo == None:
+        if timeoutInfo is None:
             status = Test.FAIL
         else:
             status = Test.TIMEOUT
@@ -795,7 +795,7 @@ def _runShTest(test, litConfig, useExter
     output = """Script:\n--\n%s\n--\nExit Code: %d\n""" % (
         '\n'.join(script), exitCode)
 
-    if timeoutInfo != None:
+    if timeoutInfo is not None:
         output += """Timeout: %s\n""" % (timeoutInfo,)
     output += "\n"
 

Modified: llvm/trunk/utils/lit/lit/main.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/main.py?rev=283088&r1=283087&r2=283088&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/main.py (original)
+++ llvm/trunk/utils/lit/lit/main.py Sun Oct  2 23:48:13 2016
@@ -309,7 +309,7 @@ def main_with_tmp(builtinParameters):
         userParams[name] = val
 
     # Decide what the requested maximum indvidual test time should be
-    if opts.maxIndividualTestTime != None:
+    if opts.maxIndividualTestTime is not None:
         maxIndividualTestTime = opts.maxIndividualTestTime
     else:
         # Default is zero
@@ -340,7 +340,7 @@ def main_with_tmp(builtinParameters):
     # After test discovery the configuration might have changed
     # the maxIndividualTestTime. If we explicitly set this on the
     # command line then override what was set in the test configuration
-    if opts.maxIndividualTestTime != None:
+    if opts.maxIndividualTestTime is not None:
         if opts.maxIndividualTestTime != litConfig.maxIndividualTestTime:
             litConfig.note(('The test suite configuration requested an individual'
                 ' test timeout of {0} seconds but a timeout of {1} seconds was'




More information about the llvm-commits mailing list