summaryrefslogtreecommitdiffstats
path: root/test/SideEffect
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/SideEffect
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/SideEffect')
-rw-r--r--test/SideEffect/directory.py3
-rw-r--r--test/SideEffect/parallel.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/test/SideEffect/directory.py b/test/SideEffect/directory.py
index 23f50af..9fcbea2 100644
--- a/test/SideEffect/directory.py
+++ b/test/SideEffect/directory.py
@@ -37,7 +37,8 @@ import os.path
import os
def copy(source, target):
- open(target, "wb").write(open(source, "rb").read())
+ with open(target, "wb") as ofp, open(source, "rb") as ifp:
+ ofp.write(ifp.read())
def build(env, source, target):
copy(str(source[0]), str(target[0]))
diff --git a/test/SideEffect/parallel.py b/test/SideEffect/parallel.py
index 63538f3..7ec53b3 100644
--- a/test/SideEffect/parallel.py
+++ b/test/SideEffect/parallel.py
@@ -52,7 +52,8 @@ except OSError as e:
src, target = sys.argv[1:]
-open(logfile, 'ab').write(('%s -> %s\\n' % (src, target)).encode())
+with open(logfile, 'ab') as f:
+ f.write(('%s -> %s\\n' % (src, target)).encode())
# Give the other threads a chance to start.
time.sleep(1)