imp updated to importlib for load_source past Python 3.4

Author: ezd1000

dbprocessing/dbprocessing.py

@@ -262,10 +262,12 @@ def figureProduct(self, filename=None):
                     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
-                    specification = importlib.util.spec_from_file_location("inspect", code) # Makes specification from the file path
-                    inspect = importlib.util.module_from_spec(specification) # Creates module
-                    specification.loader.exec_module(inspect) # Loads module
+                    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)
             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

@@ -4,7 +4,7 @@
 import datetime
 import unittest
 import tempfile
-import imp
+import sys
 import warnings
 import os
 
@@ -59,9 +59,17 @@ def setUp(self):
         self.makeTestDB()
         self.loadData(os.path.join(dbp_testing.testsdir, 'data', 'db_dumps',
                                    'testDB_dump.json'))
-        self.inspect = imp.load_source('inspect', os.path.join(
-            dbp_testing.testsdir, 'inspector', 'rot13_L1.py'))
-
+        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)
+            
     def tearDown(self):
         super(InspectorClass, self).tearDown()
         self.removeTestDB()
@@ -80,10 +88,18 @@ 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
-        inspect = imp.load_source('inspect', os.path.join(
-            dbp_testing.testsdir, 'inspector', 'rot13_L1_dlevel.py'))
-        with warnings.catch_warnings(record=True) as w:
-            self.assertEqual(repr(Diskfile.Diskfile(goodfile, self.dbu)), repr(self.inspect.Inspector(goodfile, self.dbu, 1,)()))
+        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)
+        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)
         self.assertTrue(isinstance(w[0].message, UserWarning))
         self.assertEqual('Inspector rot13_L1_dlevel.py:  set level to 2.0, '
@@ -93,8 +109,17 @@ def test_inspector(self):
         # The file doesn't match the inspector pattern...
         badfile =  os.path.join(
             dbp_testing.testsdir, 'inspector', 'testDB_01_first.raw')
-        inspect = imp.load_source('inspect', os.path.join(
-            dbp_testing.testsdir, 'inspector', 'rot13_L1.py'))
+        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)
+            
         self.assertEqual(None, inspect.Inspector(badfile, self.dbu, 1,)())
 
     def test_inspector_regex(self):