summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Platform
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/Platform
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/Platform')
-rw-r--r--src/engine/SCons/Platform/posix.py2
-rw-r--r--src/engine/SCons/Platform/win32.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
index f18569f..d1102b3 100644
--- a/src/engine/SCons/Platform/posix.py
+++ b/src/engine/SCons/Platform/posix.py
@@ -116,7 +116,7 @@ def process_cmd_output(cmd_stdout, cmd_stderr, stdout, stderr):
str = cmd_stdout.read()
if len(str) == 0:
stdout_eof = 1
- elif stdout != None:
+ elif stdout is not None:
stdout.write(str)
if cmd_stderr in i:
str = cmd_stderr.read()
diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py
index fb23d5d..1dc7f3c 100644
--- a/src/engine/SCons/Platform/win32.py
+++ b/src/engine/SCons/Platform/win32.py
@@ -134,18 +134,18 @@ def piped_spawn(sh, escape, cmd, args, env, stdout, stderr):
ret = exitvalmap[e[0]]
except KeyError:
sys.stderr.write("scons: unknown OSError exception code %d - %s: %s\n" % (e[0], cmd, e[1]))
- if stderr != None:
+ if stderr is not None:
stderr.write("scons: %s: %s\n" % (cmd, e[1]))
# copy child output from tempfiles to our streams
# and do clean up stuff
- if stdout != None and stdoutRedirected == 0:
+ if stdout is not None and stdoutRedirected == 0:
try:
stdout.write(open( tmpFileStdout, "r" ).read())
os.remove( tmpFileStdout )
except (IOError, OSError):
pass
- if stderr != None and stderrRedirected == 0:
+ if stderr is not None and stderrRedirected == 0:
try:
stderr.write(open( tmpFileStderr, "r" ).read())
os.remove( tmpFileStderr )