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

diff --git a/test/TAR/TAR.py b/test/TAR/TAR.py
index 65e6182..159f047 100644
--- a/test/TAR/TAR.py
+++ b/test/TAR/TAR.py
@@ -42,16 +42,18 @@ import sys
 opts, args = getopt.getopt(sys.argv[1:], 'cf:')
 for opt, arg in opts:
     if opt == '-f': out = arg
+
 def process(outfile, name):
     if os.path.isdir(name):
         for entry in sorted(os.listdir(name)):
             process(outfile, os.path.join(name, entry))
     else:
-        outfile.write(open(name, 'r').read())
-outfile = open(out, 'w')
-for infile in args:
-    process(outfile, infile)
-outfile.close()
+        with open(name, 'r') as ifp:
+            outfile.write(ifp.read())
+
+with open(out, 'w') as ofp:
+    for infile in args:
+        process(ofp, infile)
 sys.exit(0)
 """)
 
diff --git a/test/TAR/TARFLAGS.py b/test/TAR/TARFLAGS.py
index e1eae0f..29a1866 100644
--- a/test/TAR/TARFLAGS.py
+++ b/test/TAR/TARFLAGS.py
@@ -44,17 +44,19 @@ opt_string = ''
 for opt, arg in cmd_opts:
     if opt == '-f': out = arg
     else: opt_string = opt_string + ' ' + opt
+
 def process(outfile, name):
     if os.path.isdir(name):
         for entry in sorted(os.listdir(name)):
             process(outfile, os.path.join(name, entry))
     else:
-        outfile.write(open(name, 'r').read())
-outfile = open(out, 'w')
-outfile.write('options: %s\\n' % opt_string)
-for infile in args:
-    process(outfile, infile)
-outfile.close()
+        with open(name, 'r') as ifp:
+            outfile.write(ifp.read())
+
+with open(out, 'w') as ofp:
+    ofp.write('options: %s\\n' % opt_string)
+    for infile in args:
+        process(ofp, infile)
 sys.exit(0)
 """)