5 files changed, 6 insertions, 11 deletions
diff --git a/test/RCS/RCS_COCOM.py b/test/RCS/RCS_COCOM.py
index 8bbeb59..a1c18e5 100644
--- a/test/RCS/RCS_COCOM.py
+++ b/test/RCS/RCS_COCOM.py
@@ -58,10 +58,9 @@ for f in sys.argv[1:]:
 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()
 env = Environment(TOOLS = ['default', 'RCS'],
                   BUILDERS={'Cat':Builder(action=cat)},
diff --git a/test/RCS/RCS_COCOMSTR.py b/test/RCS/RCS_COCOMSTR.py
index 576afc1..ee3ba15 100644
--- a/test/RCS/RCS_COCOMSTR.py
+++ b/test/RCS/RCS_COCOMSTR.py
@@ -58,10 +58,9 @@ for f in sys.argv[1:]:
 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()
 env = Environment(TOOLS = ['default', 'RCS'],
                   BUILDERS={'Cat':Builder(action=cat)},
diff --git a/test/RCS/diskcheck.py b/test/RCS/diskcheck.py
index 264822a..4e7dd24 100644
--- a/test/RCS/diskcheck.py
+++ b/test/RCS/diskcheck.py
@@ -95,10 +95,9 @@ ENV = {'PATH' : os.environ['PATH'],
        'LOGNAME' : logname}
 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()
 SetOption('diskcheck', None)
 DefaultEnvironment()['ENV'] = ENV
@@ -116,7 +115,7 @@ test.write('bbb.in', "checked-out bbb.in\n")
 test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n")
 
 sub_SConscript = os.path.join('sub', 'SConscript')
-SConstruct_file_line = test.python_file_line(test.workpath('SConstruct'), 23)[:-1]
+SConstruct_file_line = test.python_file_line(test.workpath('SConstruct'), 22)[:-1]
 
 expect = """\
 
diff --git a/test/RCS/explicit.py b/test/RCS/explicit.py
index 3e19a67..75eb189 100644
--- a/test/RCS/explicit.py
+++ b/test/RCS/explicit.py
@@ -95,10 +95,9 @@ ENV = {'PATH' : os.environ['PATH'],
        'LOGNAME' : logname}
 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()
 env = Environment(ENV=ENV,
                   BUILDERS={'Cat':Builder(action=cat)},
diff --git a/test/RCS/transparent.py b/test/RCS/transparent.py
index 397017c..2ebde9a 100644
--- a/test/RCS/transparent.py
+++ b/test/RCS/transparent.py
@@ -95,10 +95,9 @@ ENV = {'PATH' : os.environ['PATH'],
        'LOGNAME' : logname}
 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()
 DefaultEnvironment()['ENV'] = ENV
 DefaultEnvironment()['RCS_COFLAGS'] = '-l'