[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>

2 files changed, 6 insertions, 5 deletions

diff --git a/test/Depends/Depends.py b/test/Depends/Depends.py
index 054b9a1..3ed9e12 100644
--- a/test/Depends/Depends.py
+++ b/test/Depends/Depends.py
@@ -40,10 +40,10 @@ test.subdir('subdir', 'sub2')
 
 test.write('build.py', r"""
 import sys
-fp = open(sys.argv[1], 'wb')
-for fname in sys.argv[2:]:
-    fp.write(open(fname, 'rb').read())
-fp.close()
+with open(sys.argv[1], 'wb') as ofp:
+    for fname in sys.argv[2:]:
+        with open(fname, 'rb') as ifp:
+            ofp.write(ifp.read())
 sys.exit(0)
 """)
 
diff --git a/test/Depends/spurious-rebuilds.py b/test/Depends/spurious-rebuilds.py
index 6afc829..f4ad040 100644
--- a/test/Depends/spurious-rebuilds.py
+++ b/test/Depends/spurious-rebuilds.py
@@ -47,7 +47,8 @@ import os.path
 if not os.path.exists('mkl'):
   os.mkdir('mkl')
 if not os.path.exists('test.c'):
-  open('test.c', 'w').write('int i;')
+  with open('test.c', 'w') as f:
+      f.write('int i;')
 
 env=Environment()
 env.SharedObject('all-defuns.obj', 'all-defuns.c')