summaryrefslogtreecommitdiffstats
path: root/test/Scanner/unicode.py
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/Scanner/unicode.py
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/Scanner/unicode.py')
-rw-r--r--test/Scanner/unicode.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/Scanner/unicode.py b/test/Scanner/unicode.py
index 96010de..227c72e 100644
--- a/test/Scanner/unicode.py
+++ b/test/Scanner/unicode.py
@@ -49,7 +49,8 @@ import codecs
import sys
def process(outfp, infile):
- contents = open(infile, 'rb').read()
+ with open(infile, 'rb') as f:
+ contents = f.read()
if contents[:len(codecs.BOM_UTF8)] == codecs.BOM_UTF8:
contents = contents[len(codecs.BOM_UTF8):].decode('utf-8')
elif contents[:len(codecs.BOM_UTF16_LE)] == codecs.BOM_UTF16_LE:
@@ -70,8 +71,8 @@ def process(outfp, infile):
else:
outfp.write(line + '\n')
-output = open(sys.argv[2], 'w')
-process(output, sys.argv[1])
+with open(sys.argv[2], 'w') as ofp:
+ process(ofp, sys.argv[1])
sys.exit(0)
""")