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

diff --git a/test/Scanner/no-Dir-node.py b/test/Scanner/no-Dir-node.py
index 69b665a..a230ea6 100644
--- a/test/Scanner/no-Dir-node.py
+++ b/test/Scanner/no-Dir-node.py
@@ -54,8 +54,6 @@ test.write('build.py', r"""
 import os.path
 import sys
 path = sys.argv[1].split()
-input = open(sys.argv[2], 'r')
-output = open(sys.argv[3], 'w')
 
 def find_file(f):
     if os.path.isabs(f):
@@ -69,12 +67,14 @@ def find_file(f):
 def process(infp, outfp):
     for line in infp.readlines():
         if line[:8] == 'include ':
-            file = line[8:-1]
-            process(find_file(file), outfp)
+            fname = line[8:-1]
+            with find_file(fname) as f:
+                process(f, outfp)
         else:
             outfp.write(line)
 
-process(input, output)
+with open(sys.argv[2], 'r') as ifp, open(sys.argv[3], 'w') as ofp:
+    process(ifp, ofp)
 
 sys.exit(0)
 """)