Fix custom importlib code for Python < 3.5

wbond · Aug 22, 2023 · 37e79cc · 37e79cc
1 parent 17014f7
commit 37e79cc
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 65 deletions.
diff --git a/dev/_import.py b/dev/_import.py
@@ -20,44 +20,44 @@
     getcwd = os.getcwd
 
 
-class ModCryptoMetaFinder(importlib.abc.MetaPathFinder):
-    def setup(self):
-        self.modules = {}
-        sys.meta_path.insert(0, self)
-
-    def add_module(self, package_name, package_path):
-        if package_name not in self.modules:
-            self.modules[package_name] = package_path
-
-    def find_spec(self, fullname, path, target=None):
-        name_parts = fullname.split('.')
-        if name_parts[0] not in self.modules:
-            return None
-
-        package = name_parts[0]
-        package_path = self.modules[package]
-
-        fullpath = os.path.join(package_path, *name_parts[1:])
-
-        if os.path.isdir(fullpath):
-            filename = os.path.join(fullpath, "__init__.py")
-            submodule_locations = [fullpath]
-        else:
-            filename = fullpath + ".py"
-            submodule_locations = None
-
-        if not os.path.exists(filename):
-            return None
-
-        return importlib.util.spec_from_file_location(
-            fullname,
-            filename,
-            loader=None,
-            submodule_search_locations=submodule_locations
-        )
+if sys.version_info >= (3, 5):
+    class ModCryptoMetaFinder(importlib.abc.MetaPathFinder):
+        def setup(self):
+            self.modules = {}
+            sys.meta_path.insert(0, self)
+
+        def add_module(self, package_name, package_path):
+            if package_name not in self.modules:
+                self.modules[package_name] = package_path
+
+        def find_spec(self, fullname, path, target=None):
+            name_parts = fullname.split('.')
+            if name_parts[0] not in self.modules:
+                return None
+
+            package = name_parts[0]
+            package_path = self.modules[package]
+
+            fullpath = os.path.join(package_path, *name_parts[1:])
+
+            if os.path.isdir(fullpath):
+                filename = os.path.join(fullpath, "__init__.py")
+                submodule_locations = [fullpath]
+            else:
+                filename = fullpath + ".py"
+                submodule_locations = None
+
+            if not os.path.exists(filename):
+                return None
+
+            return importlib.util.spec_from_file_location(
+                fullname,
+                filename,
+                loader=None,
+                submodule_search_locations=submodule_locations
+            )
 
 
-if sys.version_info >= (3, 5):
     CUSTOM_FINDER = ModCryptoMetaFinder()
     CUSTOM_FINDER.setup()
 

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -13,44 +13,44 @@
     import importlib.util
 
 
-class ModCryptoMetaFinder(importlib.abc.MetaPathFinder):
-    def setup(self):
-        self.modules = {}
-        sys.meta_path.insert(0, self)
+if sys.version_info >= (3, 5):
+    class ModCryptoMetaFinder(importlib.abc.MetaPathFinder):
+        def setup(self):
+            self.modules = {}
+            sys.meta_path.insert(0, self)
 
-    def add_module(self, package_name, package_path):
-        if package_name not in self.modules:
-            self.modules[package_name] = package_path
+        def add_module(self, package_name, package_path):
+            if package_name not in self.modules:
+                self.modules[package_name] = package_path
 
-    def find_spec(self, fullname, path, target=None):
-        name_parts = fullname.split('.')
-        if name_parts[0] not in self.modules:
-            return None
+        def find_spec(self, fullname, path, target=None):
+            name_parts = fullname.split('.')
+            if name_parts[0] not in self.modules:
+                return None
 
-        package = name_parts[0]
-        package_path = self.modules[package]
+            package = name_parts[0]
+            package_path = self.modules[package]
 
-        fullpath = os.path.join(package_path, *name_parts[1:])
+            fullpath = os.path.join(package_path, *name_parts[1:])
 
-        if os.path.isdir(fullpath):
-            filename = os.path.join(fullpath, "__init__.py")
-            submodule_locations = [fullpath]
-        else:
-            filename = fullpath + ".py"
-            submodule_locations = None
+            if os.path.isdir(fullpath):
+                filename = os.path.join(fullpath, "__init__.py")
+                submodule_locations = [fullpath]
+            else:
+                filename = fullpath + ".py"
+                submodule_locations = None
 
-        if not os.path.exists(filename):
-            return None
+            if not os.path.exists(filename):
+                return None
 
-        return importlib.util.spec_from_file_location(
-            fullname,
-            filename,
-            loader=None,
-            submodule_search_locations=submodule_locations
-        )
+            return importlib.util.spec_from_file_location(
+                fullname,
+                filename,
+                loader=None,
+                submodule_search_locations=submodule_locations
+            )
 
 
-if sys.version_info >= (3, 5):
     CUSTOM_FINDER = ModCryptoMetaFinder()
     CUSTOM_FINDER.setup()