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/Requires | |
| 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/Requires')
| -rw-r--r-- | test/Requires/basic.py | 4 | ||||
| -rw-r--r-- | test/Requires/eval-order.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/Requires/basic.py b/test/Requires/basic.py index 548e6b2a..edce13b2 100644 --- a/test/Requires/basic.py +++ b/test/Requires/basic.py @@ -36,8 +36,8 @@ test = TestSCons.TestSCons() test.write('SConstruct', """ def append_prereq_func(target, source, env): fp = open(str(target[0]), 'wb') - for s in map(str, source): - fp.write(open(s, 'rb').read()) + for s in source: + fp.write(open(str(s), 'rb').read()) fp.write(open('prereq.out', 'rb').read()) fp.close() return None diff --git a/test/Requires/eval-order.py b/test/Requires/eval-order.py index 9c1f25b4..51539a28 100644 --- a/test/Requires/eval-order.py +++ b/test/Requires/eval-order.py @@ -35,8 +35,8 @@ test = TestSCons.TestSCons() test.write('SConstruct', """ def copy_and_create_func(target, source, env): fp = open(str(target[0]), 'wb') - for s in map(str, source): - fp.write(open(s, 'rb').read()) + for s in source: + fp.write(open(str(s), 'rb').read()) fp.close() open('file.in', 'wb').write("file.in 1\\n") return None |