summaryrefslogtreecommitdiffstats
path: root/test/SConscript/SConscript.py
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 (GMT)
committerGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 (GMT)
commit22d352500f1cd6bd0c53d788a5dc44a1fefa676e (patch)
tree0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /test/SConscript/SConscript.py
parent75ac32ac8e32076e25b72a19eb56340cc585fa4e (diff)
downloadSCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.zip
SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.tar.gz
SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.tar.bz2
Move 2.0 changes collected in branches/pending back to trunk for further
development. Note that this set of changes is NOT backward-compatible; the trunk no longer works with Python 1.5.2, 2.0, or 2.1.
Diffstat (limited to 'test/SConscript/SConscript.py')
-rw-r--r--test/SConscript/SConscript.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/SConscript/SConscript.py b/test/SConscript/SConscript.py
index fa7e914..5bd49f3 100644
--- a/test/SConscript/SConscript.py
+++ b/test/SConscript/SConscript.py
@@ -83,7 +83,7 @@ SConscript('SConscript7')
test.write('SConscript', """\
# os should not be automajically imported:
-assert not globals().has_key("os")
+assert "os" not in globals()
import os
print "SConscript " + os.getcwd()