-

cool-RR · cool-RR · commit 91cab8e72855 · 2019-07-19T15:21:08.000+03:00
diff --git a/python_toolbox/import_tools.py b/python_toolbox/import_tools.py
@@ -5,7 +5,7 @@
 
 import sys
 import os.path
-import imp
+import importlib
 import zipimport
 import functools
 import pathlib
diff --git a/test_python_toolbox/__init__.py b/test_python_toolbox/__init__.py
@@ -5,6 +5,7 @@
 
 import sys
 import pathlib
+import importlib
 
 import pytest
 
@@ -17,29 +18,7 @@ def __bootstrap():
     This adds `python_toolbox`'s root folder to `sys.path` if it can't
     currently be imported.
     '''
-    import os
-    import sys
-    import imp
-
-    def exists(module_name):
-        '''
-        Return whether a module by the name `module_name` exists.
-
-        This seems to be the best way to carefully import a module.
-
-        Currently implemented for top-level packages only. (i.e. no dots.)
-
-        Doesn't support modules imported from a zip file.
-        '''
-        assert '.' not in module_name
-        try:
-            imp.find_module(module_name)
-        except ImportError:
-            return False
-        else:
-            return True
-
-    if not exists('python_toolbox'):
+    if not importlib.util.find_spec('python_toolbox'):
         python_toolbox_candidate_path = \
                                      pathlib(__file__).parent.parent.absolute()
         sys.path.append(python_toolbox_candidate_path)
