summaryrefslogtreecommitdiffstats
path: root/test/LEX
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2019-03-31 13:01:00 (GMT)
committerMats Wichmann <mats@linux.com>2019-04-25 15:37:04 (GMT)
commitf61d3bcd112285644c1a6ce253b267ef690a7e06 (patch)
tree2e489e238c11697f602cb9a7cbeb43afed088734 /test/LEX
parentb0c3385604ebc1d7d552472f1cc6d0910aafa32a (diff)
downloadSCons-f61d3bcd112285644c1a6ce253b267ef690a7e06.zip
SCons-f61d3bcd112285644c1a6ce253b267ef690a7e06.tar.gz
SCons-f61d3bcd112285644c1a6ce253b267ef690a7e06.tar.bz2
[PY 3.8] test fixes for file closings, rawstrings
On a linux host (missing some things that may be on the Travis CI setup), Py3.8a3 now shows 19 fails, 1048 pass, with 84 Warning: messages. Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test/LEX')
-rw-r--r--test/LEX/LEX.py3
-rw-r--r--test/LEX/LEXFLAGS.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/test/LEX/LEX.py b/test/LEX/LEX.py
index 65e4497..a739bfe 100644
--- a/test/LEX/LEX.py
+++ b/test/LEX/LEX.py
@@ -44,7 +44,8 @@ else:
longopts = []
cmd_opts, args = getopt.getopt(sys.argv[1:], 't', longopts)
for a in args:
- contents = open(a, 'rb').read()
+ with open(a, 'rb') as f:
+ contents = f.read()
sys.stdout.write(contents.replace(b'LEX', b'mylex.py').decode())
sys.exit(0)
""")
diff --git a/test/LEX/LEXFLAGS.py b/test/LEX/LEXFLAGS.py
index 51b6614..994834e 100644
--- a/test/LEX/LEXFLAGS.py
+++ b/test/LEX/LEXFLAGS.py
@@ -51,7 +51,8 @@ for opt, arg in cmd_opts:
if opt == '-I': i_arguments = i_arguments + ' ' + arg
else: opt_string = opt_string + ' ' + opt
for a in args:
- contents = open(a, 'r').read()
+ with open(a, 'r') as f:
+ contents = f.read()
contents = contents.replace('LEXFLAGS', opt_string)
contents = contents.replace('I_ARGS', i_arguments)
sys.stdout.write(contents)