diff options
| author | William Blevins <wblevins001@gmail.com> | 2016-09-20 16:07:30 -0400 |
|---|---|---|
| committer | William Blevins <wblevins001@gmail.com> | 2016-09-20 16:07:30 -0400 |
| commit | de9188e444af59423350cfa7d7f122120d13be00 (patch) | |
| tree | 03ded12777f86fbdae061bdc4199cabe766db2d6 /test/AR | |
| parent | a866042810446ca47cf7479f25a005f0550a163f (diff) | |
| download | scons-de9188e444af59423350cfa7d7f122120d13be00.tar.gz | |
Fixing QMTest str and bytes issues.
Diffstat (limited to 'test/AR')
| -rw-r--r-- | test/AR/AR.py | 4 | ||||
| -rw-r--r-- | test/AR/ARCOM.py | 2 | ||||
| -rw-r--r-- | test/AR/ARCOMSTR.py | 2 | ||||
| -rw-r--r-- | test/AR/ARFLAGS.py | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/test/AR/AR.py b/test/AR/AR.py index 8fb80737..573f2d94 100644 --- a/test/AR/AR.py +++ b/test/AR/AR.py @@ -36,7 +36,7 @@ test = TestSCons.TestSCons() test.write("wrapper.py", """import os import sys -open('%s', 'wb').write("wrapper.py\\n") +open('%s', 'wb').write(b"wrapper.py\\n") os.system(" ".join(sys.argv[1:])) """ % test.workpath('wrapper.out').replace('\\', '\\\\')) @@ -100,7 +100,7 @@ test.run(arguments = 'b' + _exe, stderr=TestSCons.noisy_ar, match=TestSCons.match_re_dotall) -test.fail_test(test.read('wrapper.out') != "wrapper.py\n") +test.fail_test(test.read('wrapper.out') != b"wrapper.py\n") test.pass_test() diff --git a/test/AR/ARCOM.py b/test/AR/ARCOM.py index f26ced68..bf2830e7 100644 --- a/test/AR/ARCOM.py +++ b/test/AR/ARCOM.py @@ -41,7 +41,7 @@ import sys outfile = open(sys.argv[1], 'wb') for f in sys.argv[2:]: infile = open(f, 'rb') - for l in [l for l in infile.readlines() if l != '/*ar*/\\n']: + for l in [l for l in infile.readlines() if l != b'/*ar*/\\n']: outfile.write(l) sys.exit(0) """) diff --git a/test/AR/ARCOMSTR.py b/test/AR/ARCOMSTR.py index 4c0bb854..1b1a9fbc 100644 --- a/test/AR/ARCOMSTR.py +++ b/test/AR/ARCOMSTR.py @@ -42,7 +42,7 @@ import sys outfile = open(sys.argv[1], 'wb') for f in sys.argv[2:]: infile = open(f, 'rb') - for l in [l for l in infile.readlines() if l != '/*ar*/\\n']: + for l in [l for l in infile.readlines() if l != b'/*ar*/\\n']: outfile.write(l) sys.exit(0) """) diff --git a/test/AR/ARFLAGS.py b/test/AR/ARFLAGS.py index be4e8bd4..fad9c19a 100644 --- a/test/AR/ARFLAGS.py +++ b/test/AR/ARFLAGS.py @@ -36,7 +36,7 @@ test = TestSCons.TestSCons() test.write("wrapper.py", """import os import sys -open('%s', 'wb').write("wrapper.py\\n") +open('%s', 'wb').write(b"wrapper.py\\n") os.system(" ".join(sys.argv[1:])) """ % test.workpath('wrapper.out').replace('\\', '\\\\')) @@ -99,7 +99,7 @@ test.run(arguments = 'b' + _exe, stderr=TestSCons.noisy_ar, match=TestSCons.match_re_dotall) -test.fail_test(test.read('wrapper.out') != "wrapper.py\n") +test.fail_test(test.read('wrapper.out') != b"wrapper.py\n") test.pass_test() |