mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 01:39:20 +00:00
Code Issues 32 Releases Wiki Activity

[3.2.x] Refs #32074 -- Fixed find_module()/find_loader() warnings on Python 3.10+.

Browse Source 
Backport of f1bcaa9be8227dce89a320ce1ca37e1df7c80d03 from main.
This commit is contained in:
Mariusz Felisiak 2021-09-16 20:20:54 +02:00
parent d0dc446444
commit f6726fdc3e
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/utils/version.py
View File

@ -14,6 +14,7 @@ PY36 = sys.version_info >= (3, 6)
PY37 = sys.version_info >= (3, 7) PY37 = sys.version_info >= (3, 7)
PY38 = sys.version_info >= (3, 8) PY38 = sys.version_info >= (3, 8)
PY39 = sys.version_info >= (3, 9) PY39 = sys.version_info >= (3, 9)
PY310 = sys.version_info >= (3, 10)
def get_version(version=None): def get_version(version=None):

43
tests/utils_tests/test_module_loading.py
View File

@ -9,6 +9,7 @@ from django.test.utils import extend_sys_path
from django.utils.module_loading import ( from django.utils.module_loading import (
autodiscover_modules, import_string, module_has_submodule, autodiscover_modules, import_string, module_has_submodule,
) )
from django.utils.version import PY310
class DefaultLoader(unittest.TestCase): class DefaultLoader(unittest.TestCase):
@ -184,32 +185,38 @@ class AutodiscoverModulesTestCase(SimpleTestCase):
self.assertEqual(site._registry, {'lorem': 'ipsum'}) self.assertEqual(site._registry, {'lorem': 'ipsum'})
class TestFinder: if PY310:
def __init__(self, *args, **kwargs): class TestFinder:
self.importer = zipimporter(*args, **kwargs) def __init__(self, *args, **kwargs):
self.importer = zipimporter(*args, **kwargs)
def find_module(self, path): def find_spec(self, path, target=None):
importer = self.importer.find_module(path) return self.importer.find_spec(path, target)
if importer is None: else:
return class TestFinder:
return TestLoader(importer) def __init__(self, *args, **kwargs):
self.importer = zipimporter(*args, **kwargs)
def find_module(self, path):
importer = self.importer.find_module(path)
if importer is None:
return
return TestLoader(importer)
class TestLoader: class TestLoader:
def __init__(self, importer): def __init__(self, importer):
self.importer = importer self.importer = importer
def load_module(self, name): def load_module(self, name):
mod = self.importer.load_module(name) mod = self.importer.load_module(name)
mod.__loader__ = self mod.__loader__ = self
return mod return mod
class CustomLoader(EggLoader): class CustomLoader(EggLoader):
"""The Custom Loader test is exactly the same as the EggLoader, but """The Custom Loader test is exactly the same as the EggLoader, but
it uses a custom defined Loader and Finder that is intentionally it uses a custom defined Loader class. Although the EggLoader combines both
split into two classes. Although the EggLoader combines both functions functions into one class, this isn't required.
into one class, this isn't required.
""" """
def setUp(self): def setUp(self):
super().setUp() super().setUp()