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

diff --git a/test/Scanner/dictionary.py b/test/Scanner/dictionary.py
index c587098..efe3cd2 100644
--- a/test/Scanner/dictionary.py
+++ b/test/Scanner/dictionary.py
@@ -36,8 +36,6 @@ test = TestSCons.TestSCons()
 
 test.write('build.py', r"""
 import sys
-input = open(sys.argv[1], 'r')
-output = open(sys.argv[2], 'w')
 
 include_prefix = 'include%s ' % sys.argv[1][-1]
 
@@ -45,11 +43,13 @@ def process(infp, outfp):
     for line in infp.readlines():
         if line[:len(include_prefix)] == include_prefix:
             file = line[len(include_prefix):-1]
-            process(open(file, 'r'), outfp)
+            with open(file, 'r') as f:
+                process(f, outfp)
         else:
             outfp.write(line)
 
-process(input, output)
+with open(sys.argv[2], 'w') as ofp, open(sys.argv[1], 'r') as ifp:
+    process(ifp, ofp)
 
 sys.exit(0)
 """)