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/Exit.py | |
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/Exit.py')
-rw-r--r-- | test/Exit.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/Exit.py b/test/Exit.py index 98d6bbaf..877a0b6c 100644 --- a/test/Exit.py +++ b/test/Exit.py @@ -104,10 +104,9 @@ SConscript('subdir/SConscript') test.write(['subdir', 'SConscript'], """\ def exit_builder(env, source, target): target = str(target[0]) - source = map(str, source) f = open(target, "wb") for src in source: - f.write(open(src, "rb").read()) + f.write(open(str(src), "rb").read()) f.close() Exit(27) env = Environment(BUILDERS = {'my_exit' : Builder(action=exit_builder)}) @@ -134,11 +133,9 @@ exitscan = Scanner(function = exit_scanner, skeys = ['.k']) def cat(env, source, target): target = str(target[0]) - source = map(str, source) - outf = open(target, 'wb') for src in source: - outf.write(open(src, "rb").read()) + outf.write(open(str(src), "rb").read()) outf.close() env = Environment(BUILDERS={'Cat':Builder(action=cat)}) |