Replace imp module with importlib (#202)

* first attempt to replace imp module

* migrate completely

* unify `try`s

* fix exception type

Author: GuyAv46

RLTest/loader.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 import os
 import sys
-import imp
+import importlib.util
 import inspect
 from RLTest.utils import Colors
 
@@ -17,8 +17,9 @@ def __init__(self, filename, symbol, modulename):
         self.name = '{}:{}'.format(self.modulename, symbol)
 
     def initialize(self):
-        module_file = open(self.filename)
-        module = imp.load_module(self.modulename, module_file, self.filename, ('.py', 'r', imp.PY_SOURCE))
+        module_spec = importlib.util.spec_from_file_location(self.modulename, self.filename)
+        module = importlib.util.module_from_spec(module_spec)
+        module_spec.loader.exec_module(module)
         obj = getattr(module, self.symbol)
         self.target = obj
 
@@ -50,8 +51,9 @@ def __init__(self, filename, symbol, modulename, functions):
         self.name = '{}:{}'.format(self.modulename, symbol)
 
     def initialize(self):
-        module_file = open(self.filename)
-        module = imp.load_module(self.modulename, module_file, self.filename, ('.py', 'r', imp.PY_SOURCE))
+        module_spec = importlib.util.spec_from_file_location(self.modulename, self.filename)
+        module = importlib.util.module_from_spec(module_spec)
+        module_spec.loader.exec_module(module)
         obj = getattr(module, self.symbol)
         self.clsname = obj.__name__
         self.cls = obj
@@ -113,25 +115,24 @@ def load_spec(self, arg):
     def load_files(self, module_dir, module_name, toplevel_filter=None, subfilter=None):
         filename = '%s/%s.py' % (module_dir, module_name)
         try:
-            with open(filename, 'r') as module_file:
-                try:
-                    module = imp.load_module(module_name, module_file, filename,
-                                             ('.py', 'r', imp.PY_SOURCE))
-                    for symbol in dir(module):
-                        if not self.filter_modulevar(symbol, toplevel_filter):
-                            continue
-
-                        obj = getattr(module, symbol)
-                        if inspect.isclass(obj):
-                            methnames = [mname for mname in dir(obj)
-                                         if self.filter_method(mname, subfilter)]
-                            self.tests.append(TestClass(filename, symbol, module_name, methnames))
-                        elif inspect.isfunction(obj):
-                            self.tests.append(TestFunction(filename, symbol, module_name))
-                except Exception as x:
-                    print(Colors.Red("Problems in file %s: %s" % (filename, x)))
-        except:
+            module_spec = importlib.util.spec_from_file_location(module_name, filename)
+            module = importlib.util.module_from_spec(module_spec)
+            module_spec.loader.exec_module(module)
+            for symbol in dir(module):
+                if not self.filter_modulevar(symbol, toplevel_filter):
+                    continue
+
+                obj = getattr(module, symbol)
+                if inspect.isclass(obj):
+                    methnames = [mname for mname in dir(obj)
+                                    if self.filter_method(mname, subfilter)]
+                    self.tests.append(TestClass(filename, symbol, module_name, methnames))
+                elif inspect.isfunction(obj):
+                    self.tests.append(TestFunction(filename, symbol, module_name))
+        except FileNotFoundError:
             print(Colors.Red("File %s not found: skipping" % filename))
+        except Exception as x:
+            print(Colors.Red("Problems in file %s: %s" % (filename, x)))
 
     def scan_dir(self, testdir):
         for filename in os.listdir(testdir):