Use -Wdefault when running Python testdriver (#22727)wip/python-files

2 files changed, 5 insertions, 4 deletions

diff --git a/testsuite/driver/cpu_features.py b/testsuite/driver/cpu_features.py
index 6e32d3b445..43500130db 100644
--- a/testsuite/driver/cpu_features.py
+++ b/testsuite/driver/cpu_features.py
@@ -17,7 +17,8 @@ cpu_feature_cache = None
 
 def get_cpu_features():
     if config.os in ['mingw32', 'linux'] and os.path.exists('/proc/cpuinfo'):
-        f = open('/proc/cpuinfo').read()
+        with open('/proc/cpuinfo') as x:
+            f = x.read()
         flags = re.search(r'flags\s*:\s*.*$', f, re.M)
         if flags is None:
             print('get_cpu_features: failed to find cpu features')
diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py
index e254ff13aa..223d644ee6 100644
--- a/testsuite/driver/runtests.py
+++ b/testsuite/driver/runtests.py
@@ -99,7 +99,8 @@ if args.e:
 
 if args.config_file:
     for arg in args.config_file:
-        exec(open(arg).read())
+        with io.open(arg) as f:
+            exec(f.read())
 
 if args.config:
     for arg in args.config:
@@ -349,8 +350,6 @@ except Exception as e:
     print('Failed to detect CPU features: ', e)
 
 sys.stdout.flush()
-# we output text, which cannot be unbuffered
-sys.stdout = os.fdopen(sys.__stdout__.fileno(), "w")
 
 if config.local:
     tempdir = ''
@@ -607,6 +606,7 @@ else:
       print("WARNING - skipping all tests and only reporting required hadrian dependencies:", config.hadrian_deps)
       for d in config.hadrian_deps:
         print(d,file=config.only_report_hadrian_deps)
+      config.only_report_hadrian_deps.close()
 
 if len(t.unexpected_failures) > 0 or \
    len(t.unexpected_stat_failures) > 0 or \