summaryrefslogtreecommitdiffstats
path: root/test/Scanner/exception.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/exception.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/exception.py')
-rw-r--r--test/Scanner/exception.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/Scanner/exception.py b/test/Scanner/exception.py
index 1a14152..ec19842 100644
--- a/test/Scanner/exception.py
+++ b/test/Scanner/exception.py
@@ -61,16 +61,17 @@ def process(outf, inf):
for line in inf.readlines():
if line[:8] == 'include ':
file = line[8:-1]
- process(outf, open(file, 'rb'))
+ with open(file, 'rb') as ifp:
+ process(outf, ifp)
else:
outf.write(line)
def cat(env, source, target):
target = str(target[0])
- outf = open(target, 'wb')
- for src in source:
- process(outf, open(str(src), 'rb'))
- outf.close()
+ with open(target, 'wb') as outf:
+ for src in source:
+ with open(str(src), 'rb') as inf:
+ process(outf, inf)
env = Environment(BUILDERS={'Cat':Builder(action=cat)})
env.Append(SCANNERS = [kscan])