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/Parallel | |
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/Parallel')
-rw-r--r-- | test/Parallel/ref_count.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/Parallel/ref_count.py b/test/Parallel/ref_count.py index 1eab1736..ce59668c 100644 --- a/test/Parallel/ref_count.py +++ b/test/Parallel/ref_count.py @@ -59,7 +59,6 @@ _python_ = TestSCons._python_ test = TestSCons.TestSCons() test.write('build.py', """\ -import string import sys import time args = sys.argv[1:] @@ -78,7 +77,7 @@ for ifile in args: contents = contents + open(ifile, 'rb').read() for ofile in outputs: ofp = open(ofile, 'wb') - ofp.write('%s: building from %s\\n' % (ofile, string.join(args))) + ofp.write('%s: building from %s\\n' % (ofile, " ".join(args))) ofp.write(contents) ofp.close() """) |