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/Mkdir.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/Mkdir.py')
-rw-r--r-- | test/Mkdir.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/Mkdir.py b/test/Mkdir.py index f79a32af..094e6ed7 100644 --- a/test/Mkdir.py +++ b/test/Mkdir.py @@ -41,10 +41,9 @@ Execute(Mkdir('d1')) Execute(Mkdir(Dir('#d1-Dir'))) def cat(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() Cat = Action(cat) env = Environment() @@ -127,13 +126,13 @@ test.write(['work2', 'SConstruct'], """\ import os def catdir(env, source, target): target = str(target[0]) - source = map(str, source) outfp = open(target, "wb") for src in source: - l = os.listdir(src) + s = str(src) + l = os.listdir(s) l.sort() for f in l: - f = os.path.join(src, f) + f = os.path.join(s, f) if os.path.isfile(f): outfp.write(open(f, "rb").read()) outfp.close() |