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

5 files changed, 13 insertions, 13 deletions

diff --git a/src/engine/SCons/Variables/BoolVariableTests.py b/src/engine/SCons/Variables/BoolVariableTests.py
index 88f64ed..8ffb079 100644
--- a/src/engine/SCons/Variables/BoolVariableTests.py
+++ b/src/engine/SCons/Variables/BoolVariableTests.py
@@ -39,8 +39,8 @@ class BoolVariableTestCase(unittest.TestCase):
         assert o.key == 'test', o.key
         assert o.help == 'test option help (yes|no)', o.help
         assert o.default == 0, o.default
-        assert not o.validator is None, o.validator
-        assert not o.converter is None, o.converter
+        assert o.validator is not None, o.validator
+        assert o.converter is not None, o.converter
 
     def test_converter(self):
         """Test the BoolVariable converter"""
diff --git a/src/engine/SCons/Variables/EnumVariableTests.py b/src/engine/SCons/Variables/EnumVariableTests.py
index cc9289a..f4b600d 100644
--- a/src/engine/SCons/Variables/EnumVariableTests.py
+++ b/src/engine/SCons/Variables/EnumVariableTests.py
@@ -41,8 +41,8 @@ class EnumVariableTestCase(unittest.TestCase):
         assert o.key == 'test', o.key
         assert o.help == 'test option help (one|two|three)', o.help
         assert o.default == 0, o.default
-        assert not o.validator is None, o.validator
-        assert not o.converter is None, o.converter
+        assert o.validator is not None, o.validator
+        assert o.converter is not None, o.converter
 
     def test_converter(self):
         """Test the EnumVariable converter"""
diff --git a/src/engine/SCons/Variables/PackageVariableTests.py b/src/engine/SCons/Variables/PackageVariableTests.py
index 190357e..2a93348 100644
--- a/src/engine/SCons/Variables/PackageVariableTests.py
+++ b/src/engine/SCons/Variables/PackageVariableTests.py
@@ -41,8 +41,8 @@ class PackageVariableTestCase(unittest.TestCase):
         assert o.key == 'test', o.key
         assert o.help == 'test option help\n    ( yes | no | /path/to/test )', repr(o.help)
         assert o.default == '/default/path', o.default
-        assert not o.validator is None, o.validator
-        assert not o.converter is None, o.converter
+        assert o.validator is not None, o.validator
+        assert o.converter is not None, o.converter
 
     def test_converter(self):
         """Test the PackageVariable converter"""
diff --git a/src/engine/SCons/Variables/PathVariableTests.py b/src/engine/SCons/Variables/PathVariableTests.py
index 4e6436e..1643252 100644
--- a/src/engine/SCons/Variables/PathVariableTests.py
+++ b/src/engine/SCons/Variables/PathVariableTests.py
@@ -44,7 +44,7 @@ class PathVariableTestCase(unittest.TestCase):
         assert o.key == 'test', o.key
         assert o.help == 'test option help ( /path/to/test )', repr(o.help)
         assert o.default == '/default/path', o.default
-        assert not o.validator is None, o.validator
+        assert o.validator is not None, o.validator
         assert o.converter is None, o.converter
 
     def test_PathExists(self):
diff --git a/src/engine/SCons/Variables/VariablesTests.py b/src/engine/SCons/Variables/VariablesTests.py
index 69ef9fe..493d69f 100644
--- a/src/engine/SCons/Variables/VariablesTests.py
+++ b/src/engine/SCons/Variables/VariablesTests.py
@@ -85,9 +85,9 @@ class VariablesTestCase(unittest.TestCase):
         o = opts.options[0]
         assert o.key == 'VAR'
         assert o.help == ''
-        assert o.default == None
-        assert o.validator == None
-        assert o.converter == None
+        assert o.default is None
+        assert o.validator is None
+        assert o.converter is None
 
         o = opts.options[1]
         assert o.key == 'ANSWER'
@@ -120,9 +120,9 @@ class VariablesTestCase(unittest.TestCase):
         o = opts.options[0]
         assert o.key == 'VAR2', o.key
         assert o.help == '', o.help
-        assert o.default == None, o.default
-        assert o.validator == None, o.validator
-        assert o.converter == None, o.converter
+        assert o.default is None, o.default
+        assert o.validator is None, o.validator
+        assert o.converter is None, o.converter
 
         o = opts.options[1]
         assert o.key == 'ANSWER2', o.key