diff options
author | Greg Noel <GregNoel@tigris.org> | 2010-03-25 04:14:28 +0000 |
---|---|---|
committer | Greg Noel <GregNoel@tigris.org> | 2010-03-25 04:14:28 +0000 |
commit | af6d7c35464bb75dcabc72094b4bd84154dde50d (patch) | |
tree | 0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /test/DVIPS | |
parent | 55ef7fe83e3211be3045f089767ca8e198db1c2c (diff) | |
download | scons-af6d7c35464bb75dcabc72094b4bd84154dde50d.tar.gz |
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/DVIPS')
-rw-r--r-- | test/DVIPS/DVIPS.py | 7 | ||||
-rw-r--r-- | test/DVIPS/DVIPSFLAGS.py | 7 | ||||
-rw-r--r-- | test/DVIPS/PSCOM.py | 2 | ||||
-rw-r--r-- | test/DVIPS/PSCOMSTR.py | 2 |
4 files changed, 6 insertions, 12 deletions
diff --git a/test/DVIPS/DVIPS.py b/test/DVIPS/DVIPS.py index 540869d9..e28a1212 100644 --- a/test/DVIPS/DVIPS.py +++ b/test/DVIPS/DVIPS.py @@ -24,8 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import string - import TestSCons _python_ = TestSCons._python_ @@ -122,12 +120,11 @@ dvips = test.where_is('dvips') if dvips: test.write("wrapper.py", """import os -import string import sys -cmd = string.join(sys.argv[1:], " ") +cmd = " ".join(sys.argv[1:]) open('%s', 'ab').write("%%s\\n" %% cmd) os.system(cmd) -""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\')) +""" % test.workpath('wrapper.out').replace('\\', '\\\\')) test.write('SConstruct', """ import os diff --git a/test/DVIPS/DVIPSFLAGS.py b/test/DVIPS/DVIPSFLAGS.py index a5be0a27..285c7290 100644 --- a/test/DVIPS/DVIPSFLAGS.py +++ b/test/DVIPS/DVIPSFLAGS.py @@ -24,8 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import string - import TestSCons _python_ = TestSCons._python_ @@ -129,12 +127,11 @@ dvips = test.where_is('dvips') if dvips: test.write("wrapper.py", """import os -import string import sys -cmd = string.join(sys.argv[1:], " ") +cmd = " ".join(sys.argv[1:]) open('%s', 'ab').write("%%s\\n" %% cmd) os.system(cmd) -""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\')) +""" % test.workpath('wrapper.out').replace('\\', '\\\\')) test.write('SConstruct', """ import os diff --git a/test/DVIPS/PSCOM.py b/test/DVIPS/PSCOM.py index 3e1e5e9f..fe4832bd 100644 --- a/test/DVIPS/PSCOM.py +++ b/test/DVIPS/PSCOM.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 != '/*ps*/\\n', infile.readlines()): + for l in [l for l in infile.readlines() if l != '/*ps*/\\n']: outfile.write(l) sys.exit(0) """) diff --git a/test/DVIPS/PSCOMSTR.py b/test/DVIPS/PSCOMSTR.py index 96814a0d..7c57ded1 100644 --- a/test/DVIPS/PSCOMSTR.py +++ b/test/DVIPS/PSCOMSTR.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 != '/*ps*/\\n', infile.readlines()): + for l in [l for l in infile.readlines() if l != '/*ps*/\\n']: outfile.write(l) sys.exit(0) """) |