summaryrefslogtreecommitdiffstats
path: root/test/Alias
diff options
context:
space:
mode:
Diffstat (limited to 'test/Alias')
-rw-r--r--test/Alias/action.py11
-rw-r--r--test/Alias/scanner.py3
2 files changed, 6 insertions, 8 deletions
diff --git a/test/Alias/action.py b/test/Alias/action.py
index 72aab6e..74eb6f9 100644
--- a/test/Alias/action.py
+++ b/test/Alias/action.py
@@ -35,20 +35,19 @@ test = TestSCons.TestSCons()
test.write('SConstruct', """
def cat(target, source, env):
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()
def foo(target, source, env):
- target = map(str, target)
- source = map(str, source)
+ target = list(map(str, target))
+ source = list(map(str, source))
open('foo', 'wb').write("foo(%s, %s)\\n" % (target, source))
def bar(target, source, env):
- target = map(str, target)
- source = map(str, source)
+ target = list(map(str, target))
+ source = list(map(str, source))
open('bar', 'wb').write("bar(%s, %s)\\n" % (target, source))
env = Environment(BUILDERS = {'Cat':Builder(action=cat)})
diff --git a/test/Alias/scanner.py b/test/Alias/scanner.py
index 743191c..fc78546 100644
--- a/test/Alias/scanner.py
+++ b/test/Alias/scanner.py
@@ -35,10 +35,9 @@ test = TestSCons.TestSCons()
test.write('SConstruct', """
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()
XBuilder = Builder(action = cat, src_suffix = '.x', suffix = '.c')