diff options
Diffstat (limited to 'test/SCCS/transparent.py')
| -rw-r--r-- | test/SCCS/transparent.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/test/SCCS/transparent.py b/test/SCCS/transparent.py index adc0fe1..a8105a2 100644 --- a/test/SCCS/transparent.py +++ b/test/SCCS/transparent.py @@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test transparent checkouts from SCCS files in an SCCS subdirectory. """ -import string - import TestSCons test = TestSCons.TestSCons() @@ -73,10 +71,9 @@ test.write(['SConstruct'], """ DefaultEnvironment()['SCCSCOM'] = 'cd ${TARGET.dir} && $SCCS get ${TARGET.file}' 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(BUILDERS={'Cat':Builder(action=cat)}, SCCSFLAGS='-k') @@ -93,7 +90,7 @@ test.write(['sub', 'eee.in'], "checked-out sub/eee.in\n") test.run(arguments = '.', stderr = None) -lines = string.split(""" +lines = """ sccs get SConscript sccs get aaa.in cat(["aaa.out"], ["aaa.in"]) @@ -107,7 +104,7 @@ cat(["sub/eee.out"], ["sub/eee.in"]) sccs get fff.in cat(["sub/fff.out"], ["sub/fff.in"]) cat(["sub/all"], ["sub/ddd.out", "sub/eee.out", "sub/fff.out"]) -""", '\n') +""".split('\n') test.must_contain_all_lines(test.stdout(), lines) |