diff options
author | William Blevins <wblevins001@gmail.com> | 2016-09-22 17:19:50 -0400 |
---|---|---|
committer | William Blevins <wblevins001@gmail.com> | 2016-09-22 17:19:50 -0400 |
commit | c656843961d92cf79f14a2298054d255de67afab (patch) | |
tree | da169366f448026e53f19b21c854a9c53be79644 /test/LEX | |
parent | 2d15eeac923a7f8e2d2d1c7e1feb0f7eac95a9e7 (diff) | |
download | scons-c656843961d92cf79f14a2298054d255de67afab.tar.gz |
Yet another batch of test fixes.
Diffstat (limited to 'test/LEX')
-rw-r--r-- | test/LEX/LEX.py | 2 | ||||
-rw-r--r-- | test/LEX/LEXCOM.py | 2 | ||||
-rw-r--r-- | test/LEX/LEXCOMSTR.py | 2 | ||||
-rw-r--r-- | test/LEX/LEXFLAGS.py | 6 | ||||
-rw-r--r-- | test/LEX/live.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/test/LEX/LEX.py b/test/LEX/LEX.py index 975d4e9c..1239c6b4 100644 --- a/test/LEX/LEX.py +++ b/test/LEX/LEX.py @@ -41,7 +41,7 @@ import sys cmd_opts, args = getopt.getopt(sys.argv[1:], 't', []) for a in args: contents = open(a, 'rb').read() - sys.stdout.write(contents.replace('LEX', 'mylex.py')) + sys.stdout.write(contents.replace(b'LEX', b'mylex.py').decode()) sys.exit(0) """) diff --git a/test/LEX/LEXCOM.py b/test/LEX/LEXCOM.py index 5fb82fed..6a323881 100644 --- a/test/LEX/LEXCOM.py +++ b/test/LEX/LEXCOM.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 != '/*lex*/\\n']: + for l in [l for l in infile.readlines() if l != b'/*lex*/\\n']: outfile.write(l) sys.exit(0) """) diff --git a/test/LEX/LEXCOMSTR.py b/test/LEX/LEXCOMSTR.py index 83b2f9c0..07e693cc 100644 --- a/test/LEX/LEXCOMSTR.py +++ b/test/LEX/LEXCOMSTR.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 != '/*lex*/\\n']: + for l in [l for l in infile.readlines() if l != b'/*lex*/\\n']: outfile.write(l) sys.exit(0) """) diff --git a/test/LEX/LEXFLAGS.py b/test/LEX/LEXFLAGS.py index 82ae5865..54df1617 100644 --- a/test/LEX/LEXFLAGS.py +++ b/test/LEX/LEXFLAGS.py @@ -48,9 +48,9 @@ for opt, arg in cmd_opts: else: opt_string = opt_string + ' ' + opt for a in args: contents = open(a, 'rb').read() - contents = contents.replace('LEXFLAGS', opt_string) - contents = contents.replace('I_ARGS', i_arguments) - sys.stdout.write(contents) + contents = contents.replace(b'LEXFLAGS', opt_string.encode()) + contents = contents.replace(b'I_ARGS', i_arguments.encode()) + sys.stdout.write(contents.decode()) sys.exit(0) """) diff --git a/test/LEX/live.py b/test/LEX/live.py index e4b4dfb3..2abb8ce3 100644 --- a/test/LEX/live.py +++ b/test/LEX/live.py @@ -44,7 +44,7 @@ if not lex: 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('\\', '\\\\')) |