Issue 2401: Fix usage of comparison with None, patch from Jared Grubb

5 files changed, 18 insertions, 18 deletions

diff --git a/src/engine/SCons/Node/AliasTests.py b/src/engine/SCons/Node/AliasTests.py
index 184e710..82322e3 100644
--- a/src/engine/SCons/Node/AliasTests.py
+++ b/src/engine/SCons/Node/AliasTests.py
@@ -35,7 +35,7 @@ class AliasTestCase(unittest.TestCase):
         """Test creating an Alias name space
         """
         ans = SCons.Node.Alias.AliasNameSpace()
-        assert not ans is None, ans
+        assert ans is not None, ans
 
     def test_ANS_Alias(self):
         """Test the Alias() factory
@@ -82,7 +82,7 @@ class AliasTestCase(unittest.TestCase):
         assert a is a1, a1
 
         a = ans.lookup('a2')
-        assert a == None, a
+        assert a is None, a
 
     def test_Alias(self):
         """Test creating an Alias() object
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index 642d701..cb2bd68 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -611,7 +611,7 @@ class BaseTestCase(_tempdirTestCase):
 
         e1 = fs.Entry('e1')
         s = e1.stat()
-        assert not s is None, s
+        assert s is not None, s
 
         e2 = fs.Entry('e2')
         s = e2.stat()
@@ -1386,7 +1386,7 @@ class FSTestCase(_tempdirTestCase):
 
         f = fs.File('does_not_exist')
         r = f.remove()
-        assert r == None, r
+        assert r is None, r
 
         test.write('exists', "exists\n")
         f = fs.File('exists')
diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index 4612d3f..643e218 100644
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -295,9 +295,9 @@ class NodeTestCase(unittest.TestCase):
         # Make sure it doesn't blow up if no builder is set.
         node = MyNode("www")
         node.build()
-        assert built_it == None
+        assert built_it is None
         node.build(extra_kw_argument = 1)
-        assert built_it == None
+        assert built_it is None
 
         node = MyNode("xxx")
         node.builder_set(Builder())
@@ -522,7 +522,7 @@ class NodeTestCase(unittest.TestCase):
         n = SCons.Node.Node()
         t, m = n.alter_targets()
         assert t == [], t
-        assert m == None, m
+        assert m is None, m
 
     def test_is_up_to_date(self):
         """Test the default is_up_to_date() method
@@ -622,7 +622,7 @@ class NodeTestCase(unittest.TestCase):
         node.fs = FS()
         node.fs.Top = SCons.Node.Node()
         result = node.explain()
-        assert result == None, result
+        assert result is None, result
 
         def get_null_info():
             class Null_SConsignEntry:
@@ -1020,7 +1020,7 @@ class NodeTestCase(unittest.TestCase):
 
     def test_scanner_key(self):
         """Test that a scanner_key() method exists"""
-        assert SCons.Node.Node().scanner_key() == None
+        assert SCons.Node.Node().scanner_key() is None
 
     def test_children(self):
         """Test fetching the non-ignored "children" of a Node.
@@ -1104,7 +1104,7 @@ class NodeTestCase(unittest.TestCase):
         assert not nw.is_done()
         assert nw.next().name ==  "n1"
         assert nw.is_done()
-        assert nw.next() == None
+        assert nw.next() is None
 
         n2 = MyNode("n2")
         n3 = MyNode("n3")
@@ -1118,7 +1118,7 @@ class NodeTestCase(unittest.TestCase):
         n = nw.next()
         assert n.name ==  "n1", n.name
         n = nw.next()
-        assert n == None, n
+        assert n is None, n
 
         n4 = MyNode("n4")
         n5 = MyNode("n5")
@@ -1138,7 +1138,7 @@ class NodeTestCase(unittest.TestCase):
         assert nw.next().name ==  "n3"
         assert nw.history.has_key(n1)
         assert nw.next().name ==  "n1"
-        assert nw.next() == None
+        assert nw.next() is None
 
         n8 = MyNode("n8")
         n8.add_dependency([n3])
@@ -1160,7 +1160,7 @@ class NodeTestCase(unittest.TestCase):
         n = nw.next()
         assert n.name == "n7", n.name
         n = nw.next()
-        assert nw.next() == None
+        assert nw.next() is None
 
     def test_abspath(self):
         """Test the get_abspath() method."""
diff --git a/src/engine/SCons/Node/Python.py b/src/engine/SCons/Node/Python.py
index c443594..eba008b 100644
--- a/src/engine/SCons/Node/Python.py
+++ b/src/engine/SCons/Node/Python.py
@@ -53,7 +53,7 @@ class Value(SCons.Node.Node):
     def __init__(self, value, built_value=None):
         SCons.Node.Node.__init__(self)
         self.value = value
-        if not built_value is None:
+        if built_value is not None:
             self.built_value = built_value
 
     def str_for_display(self):
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index ee9083c..c4f36cc 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -352,7 +352,7 @@ class Node:
             if d.missing():
                 msg = "Explicit dependency `%s' not found, needed by target `%s'."
                 raise SCons.Errors.StopError, msg % (d, self)
-        if not self.implicit is None:
+        if self.implicit is not None:
             for i in self.implicit:
                 if i.missing():
                     msg = "Implicit dependency `%s' not found, needed by target `%s'."
@@ -474,7 +474,7 @@ class Node:
             # There was no explicit builder for this Node, so initialize
             # the self.builder attribute to None now.
             b = self.builder = None
-        return not b is None
+        return b is not None
 
     def set_explicit(self, is_explicit):
         self.is_explicit = is_explicit
@@ -602,7 +602,7 @@ class Node:
         # Don't bother scanning non-derived files, because we don't
         # care what their dependencies are.
         # Don't scan again, if we already have scanned.
-        if not self.implicit is None:
+        if self.implicit is not None:
             return
         self.implicit = []
         self.implicit_set = set()
@@ -891,7 +891,7 @@ class Node:
 
     def add_wkid(self, wkid):
         """Add a node to the list of kids waiting to be evaluated"""
-        if self.wkids != None:
+        if self.wkids is not None:
             self.wkids.append(wkid)
 
     def _children_reset(self):