[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, 10 insertions, 10 deletions

diff --git a/test/M4/M4COM.py b/test/M4/M4COM.py
index 4e95419..756cd55 100644
--- a/test/M4/M4COM.py
+++ b/test/M4/M4COM.py
@@ -38,11 +38,11 @@ test = TestSCons.TestSCons()
 
 test.write('mym4.py', """
 import sys
-outfile = open(sys.argv[1], 'wb')
-for f in sys.argv[2:]:
-    infile = open(f, 'rb')
-    for l in [l for l in infile.readlines() if l != b'/*m4*/\\n']:
-        outfile.write(l)
+with open(sys.argv[1], 'wb') as ofp:
+    for f in sys.argv[2:]:
+        with open(f, 'rb') as ifp:
+            for l in [l for l in ifp.readlines() if l != b'/*m4*/\\n']:
+                ofp.write(l)
 sys.exit(0)
 """)
 
diff --git a/test/M4/M4COMSTR.py b/test/M4/M4COMSTR.py
index 0e6725b..106cd1d 100644
--- a/test/M4/M4COMSTR.py
+++ b/test/M4/M4COMSTR.py
@@ -39,11 +39,11 @@ test = TestSCons.TestSCons()
 
 test.write('mym4.py', """
 import sys
-outfile = open(sys.argv[1], 'wb')
-for f in sys.argv[2:]:
-    infile = open(f, 'rb')
-    for l in [l for l in infile.readlines() if l != b'/*m4*/\\n']:
-        outfile.write(l)
+with open(sys.argv[1], 'wb') as ofp:
+    for f in sys.argv[2:]:
+        with open(f, 'rb') as ifp:
+            for l in [l for l in ifp.readlines() if l != b'/*m4*/\\n']:
+                ofp.write(l)
 sys.exit(0)
 """)