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

1 files changed, 9 insertions, 8 deletions

diff --git a/test/CPPSUFFIXES.py b/test/CPPSUFFIXES.py
index 141df29..9b8dd90 100644
--- a/test/CPPSUFFIXES.py
+++ b/test/CPPSUFFIXES.py
@@ -37,14 +37,15 @@ test = TestSCons.TestSCons()
 test.write('mycc.py', r"""
 import sys
 def do_file(outf, inf):
-    for line in open(inf, 'r').readlines():
-        if line[:10] == '#include <':
-            do_file(outf, line[10:-2])
-        else:
-            outf.write(line)
-outf = open(sys.argv[1], 'w')
-for f in sys.argv[2:]:
-    do_file(outf, f)
+    with open(inf, 'r') as ifp:
+        for line in ifp.readlines():
+            if line[:10] == '#include <':
+                do_file(outf, line[10:-2])
+            else:
+                outf.write(line)
+with open(sys.argv[1], 'w') as outf:
+    for f in sys.argv[2:]:
+        do_file(outf, f)
 sys.exit(0)
 """)