diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-03-25 04:14:28 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-03-25 04:14:28 (GMT) |
| commit | 22d352500f1cd6bd0c53d788a5dc44a1fefa676e (patch) | |
| tree | 0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /test/SConscript | |
| parent | 75ac32ac8e32076e25b72a19eb56340cc585fa4e (diff) | |
| download | SCons-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')
| -rw-r--r-- | test/SConscript/SConscript.py | 2 | ||||
| -rw-r--r-- | test/SConscript/src_dir.py | 2 |
2 files changed, 2 insertions, 2 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() diff --git a/test/SConscript/src_dir.py b/test/SConscript/src_dir.py index 1a3a3df..967e391 100644 --- a/test/SConscript/src_dir.py +++ b/test/SConscript/src_dir.py @@ -57,7 +57,7 @@ from os.path import join from os.path import basename Import('env') -sources = map(basename, glob(join(str(env.Dir('.').srcnode()),'*.c'))) +sources = list(map(basename, glob(join(str(env.Dir('.').srcnode()),'*.c')))) # Trivial example; really I read the configuration file # their build system uses to generate the vcproj files |