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/SWIG | |
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/SWIG')
-rw-r--r-- | test/SWIG/SWIGCOM.py | 2 | ||||
-rw-r--r-- | test/SWIG/SWIGCOMSTR.py | 2 | ||||
-rw-r--r-- | test/SWIG/live.py | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/test/SWIG/SWIGCOM.py b/test/SWIG/SWIGCOM.py index d1d7776..44602fd 100644 --- a/test/SWIG/SWIGCOM.py +++ b/test/SWIG/SWIGCOM.py @@ -41,7 +41,7 @@ import sys outfile = open(sys.argv[1], 'wb') for f in sys.argv[2:]: infile = open(f, 'rb') - for l in filter(lambda l: l != '/*swig*/\\n', infile.readlines()): + for l in [l for l in infile.readlines() if l != '/*swig*/\\n']: outfile.write(l) sys.exit(0) """) diff --git a/test/SWIG/SWIGCOMSTR.py b/test/SWIG/SWIGCOMSTR.py index 739c781..1df3499 100644 --- a/test/SWIG/SWIGCOMSTR.py +++ b/test/SWIG/SWIGCOMSTR.py @@ -42,7 +42,7 @@ import sys outfile = open(sys.argv[1], 'wb') for f in sys.argv[2:]: infile = open(f, 'rb') - for l in filter(lambda l: l != '/*swig*/\\n', infile.readlines()): + for l in [l for l in infile.readlines() if l != '/*swig*/\\n']: outfile.write(l) sys.exit(0) """) diff --git a/test/SWIG/live.py b/test/SWIG/live.py index 0a4c905..8f580c9 100644 --- a/test/SWIG/live.py +++ b/test/SWIG/live.py @@ -29,7 +29,6 @@ Test SWIG behavior with a live, installed SWIG. """ import os.path -import string import sys import TestSCons @@ -58,11 +57,10 @@ ldmodule_prefix = '_' test.write("wrapper.py", """import os -import string import sys open('%s', 'wb').write("wrapper.py\\n") -os.system(string.join(sys.argv[1:], " ")) -""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\')) +os.system(" ".join(sys.argv[1:])) +""" % test.workpath('wrapper.out').replace('\\', '\\\\')) test.write('SConstruct', """\ foo = Environment(SWIGFLAGS='-python', |