summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Environment.py
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2009-05-03 06:24:01 (GMT)
committerGreg Noel <GregNoel@tigris.org>2009-05-03 06:24:01 (GMT)
commitff74e256dccabac534aa952431063a23dfae9ac2 (patch)
treee50f626c5c42ff28c3cd21ab63f167627d08d7d4 /src/engine/SCons/Environment.py
parent940ba4016c26bc49bdcb4e48bdd6b8b541e2aa1f (diff)
downloadSCons-ff74e256dccabac534aa952431063a23dfae9ac2.zip
SCons-ff74e256dccabac534aa952431063a23dfae9ac2.tar.gz
SCons-ff74e256dccabac534aa952431063a23dfae9ac2.tar.bz2
Issue 2401: Fix usage of comparison with None, patch from Jared Grubb
Diffstat (limited to 'src/engine/SCons/Environment.py')
-rw-r--r--src/engine/SCons/Environment.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py
index 37dd3b4..80d8516 100644
--- a/src/engine/SCons/Environment.py
+++ b/src/engine/SCons/Environment.py
@@ -245,9 +245,9 @@ class BuilderWrapper(MethodWrapper):
if source is _null:
source = target
target = None
- if not target is None and not SCons.Util.is_List(target):
+ if target is not None and not SCons.Util.is_List(target):
target = [target]
- if not source is None and not SCons.Util.is_List(source):
+ if source is not None and not SCons.Util.is_List(source):
source = [source]
return apply(MethodWrapper.__call__, (self, target, source) + args, kw)
@@ -457,9 +457,9 @@ class SubstitutionEnvironment:
n = None
for l in lookup_list:
n = l(v)
- if not n is None:
+ if n is not None:
break
- if not n is None:
+ if n is not None:
if SCons.Util.is_String(n):
# n = self.subst(n, raw=1, **kw)
kw['raw'] = 1
@@ -1822,7 +1822,7 @@ class Base(SubstitutionEnvironment):
def CacheDir(self, path):
import SCons.CacheDir
- if not path is None:
+ if path is not None:
path = self.subst(path)
self._CacheDir_path = path
@@ -2013,7 +2013,7 @@ class Base(SubstitutionEnvironment):
return apply(SCons.Scanner.Base, nargs, nkw)
def SConsignFile(self, name=".sconsign", dbm_module=None):
- if not name is None:
+ if name is not None:
name = self.subst(name)
if not os.path.isabs(name):
name = os.path.join(str(self.fs.SConstruct_dir), name)