diff options
| author | Mats Wichmann <mats@linux.com> | 2019-03-31 13:01:00 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2019-04-25 15:37:04 (GMT) |
| commit | f61d3bcd112285644c1a6ce253b267ef690a7e06 (patch) | |
| tree | 2e489e238c11697f602cb9a7cbeb43afed088734 /test/Variables | |
| parent | b0c3385604ebc1d7d552472f1cc6d0910aafa32a (diff) | |
| download | SCons-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/Variables')
| -rw-r--r-- | test/Variables/Variables.py | 4 | ||||
| -rw-r--r-- | test/Variables/chdir.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/Variables/Variables.py b/test/Variables/Variables.py index 0fe3745..09a17d5 100644 --- a/test/Variables/Variables.py +++ b/test/Variables/Variables.py @@ -231,7 +231,9 @@ opts.Save('variables.saved', env) def checkSave(file, expected): gdict = {} ldict = {} - exec(open(file, 'r').read(), gdict, ldict) + with open(file, 'r') as f: + contents = f.read() + exec(contents, gdict, ldict) assert expected == ldict, "%s\n...not equal to...\n%s" % (expected, ldict) # First test with no command line variables diff --git a/test/Variables/chdir.py b/test/Variables/chdir.py index b5fce2a..bdf390d 100644 --- a/test/Variables/chdir.py +++ b/test/Variables/chdir.py @@ -52,7 +52,9 @@ print("VARIABLE = "+repr(env['VARIABLE'])) test.write(['bin', 'opts.cfg'], """\ import os os.chdir(os.path.split(__name__)[0]) -exec(open('opts2.cfg', 'r').read()) +with open('opts2.cfg', 'r') as f: + contents = f.read() +exec(contents) """) test.write(['bin', 'opts2.cfg'], """\ |