Creating function to handle the update of imp to importlib

Author: ezd1000

dbprocessing/Utils.py

@@ -560,3 +560,18 @@ def readconfig(config_filepath):
                 else:
                     ans[section][item] = (ans[section][item], 0, 0)
     return ans
+def load_source(modname, filepath, module):
+    """
+    The imp module was removed in Python 3.4, thus, adaptations were made so the imp.load_source feature can be used for later Python versions
+    """
+    try:
+        import importlib.util
+        import importlib.machinery
+        loader = importlib.machinery.SourceFileLoader(modname, filepath)
+        spec = importlib.util.spec_from_file_location(modname, filepath, loader=loader)
+        module = importlib.util.module_from_spec(spec)
+        loader.exec_module(module)
+    except ImportError:
+        import imp # Depracated in Python 3.4
+        module = imp.load_source(modname, filepath)
+    return module

dbprocessing/dbprocessing.py

@@ -258,16 +258,9 @@ def figureProduct(self, filename=None):
         claimed = []
         for code, desc, arg, product in act_insp:
             try:
-                if sys.version_info < (3,4):
-                    import imp # imp is deprecated at python 3.4
-                    inspect = imp.load_source('inspect', code)
-                else:
-                    import importlib.util  # used in python 3.4 and above
-                    import importlib.machinery
-                    loader = importlib.machinery.SourceFileLoader('inspect', code)
-                    spec = importlib.util.spec_from_file_location('inspect', code, loader=loader)
-                    inspect = importlib.util.module_from_spec(spec)
-                    loader.exec_module(inspect)
+                fname = code
+                inspect = None
+                inspect = Utils.load_source('inspect',fname, inspect)
             except IOError as msg:
                 DBlogging.dblogger.error('Inspector: "{0}" not found: {1}'.format(code, msg))
                 if os.path.isfile(code + ' '):

unit_tests/test_Inspector.py

@@ -14,6 +14,7 @@
 from dbprocessing import Version
 from dbprocessing import DButils
 from dbprocessing import Diskfile
+from dbprocessing import Utils
 
 class InspectorFunctions(unittest.TestCase):
     """Tests of the inspector functions"""
@@ -59,17 +60,9 @@ def setUp(self):
         self.makeTestDB()
         self.loadData(os.path.join(dbp_testing.testsdir, 'data', 'db_dumps',
                                    'testDB_dump.json'))
-        if sys.version_info < (3, 4):
-            import imp
-            self.inspect = imp.load_source('inspect', os.path.join(dbp_testing.testsdir, 'inspector', 'rot13_L1.py'))
-        else:
-            import importlib.util
-            import importlib.machinery
-            loader = importlib.machinery.SourceFileLoader('inspect', os.path.join(dbp_testing.testsdir, 'inspector', 'rot13_L1.py'))
-            spec = importlib.util.spec_from_file_location('inspect', os.path.join(dbp_testing.testsdir, 'inspector', 'rot13_L1.py'), loader=loader)
-            self.inspect = importlib.util.module_from_spec(spec)
-            loader.exec_module(self.inspect)
-            
+        filename = os.path.join(dbp_testing.testsdir, 'inspector', 'rot13_L1.py')
+        self.inspect = None
+        self.inspect = Utils.load_source('inspect', filename, self.inspect)
     def tearDown(self):
         super(InspectorClass, self).tearDown()
         self.removeTestDB()
@@ -88,16 +81,9 @@ def test_inspector(self):
         self.assertEqual(repr(Diskfile.Diskfile(goodfile, self.dbu)), repr(self.inspect.Inspector(goodfile, self.dbu, 1,)()))
         #self.assertEqual(None, self.inspect.Inspector(goodfile, self.dbu, 1,).extract_YYYYMMDD())
         # This inspector sets the data_level - not allowed
-        if sys.version_info < (3, 4):
-            import imp # Depracated in Python 3.4
-            inspect = imp.load_source('inspect', os.path.join(dbp_testing.testsdir, 'inspector', 'rot13_L1_dlevel.py'))
-        else:
-            import importlib.util
-            import importlib.machinery
-            loader = importlib.machinery.SourceFileLoader('inspect', os.path.join(dbp_testing.testsdir, 'inspector', 'rot13_L1_dlevel.py'))
-            spec = importlib.util.spec_from_file_location('inspect', os.path.join(dbp_testing.testsdir, 'inspector', 'rot13_L1_dlevel.py'), loader=loader)
-            inspect = importlib.util.module_from_spec(spec)
-            loader.exec_module(inspect)
+        filename = os.path.join(dbp_testing.testsdir, 'inspector', 'rot13_L1_dlevel.py')
+        inspect = None
+        inspect = Utils.load_source('inspect', filename, inspect)
         with warnings.catch_warnings(record=True) as w: 
             self.assertEqual(repr(Diskfile.Diskfile(goodfile, self.dbu)), repr(inspect.Inspector(goodfile, self.dbu, 1,)()))
         self.assertEqual(len(w), 1)
@@ -109,17 +95,9 @@ def test_inspector(self):
         # The file doesn't match the inspector pattern...
         badfile =  os.path.join(
             dbp_testing.testsdir, 'inspector', 'testDB_01_first.raw')
-        if sys.version_info < (3, 4):
-            import imp # Depracated in Python 3.4
-            inspect = imp.load_source('inspect', os.path.join(dbp_testing.testsdir, 'inspector', 'rot13_L1.py'))
-        else:
-            import importlib.util
-            import importlib.machinery
-            loader = importlib.machinery.SourceFileLoader('inspect', os.path.join(dbp_testing.testsdir, 'inspector', 'rot13_L1.py'))
-            spec = importlib.util.spec_from_file_location('inspect', os.path.join(dbp_testing.testsdir, 'inspector', 'rot13_L1.py'), loader=loader)
-            inspect = importlib.util.module_from_spec(spec)
-            loader.exec_module(inspect)
-            
+        filename = os.path.join(dbp_testing.testsdir, 'inspector', 'rot13_L1.py')
+        inspect = None
+        inspect = Utils.load_source('inspect', filename, inspect)    
         self.assertEqual(None, inspect.Inspector(badfile, self.dbu, 1,)())
 
     def test_inspector_regex(self):