Refs #32074 -- Fixed find_module()/find_loader() warnings on Python 3.10+.
This commit is contained in:
parent
306607d5b9
commit
f1bcaa9be8
|
@ -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,7 +185,15 @@ class AutodiscoverModulesTestCase(SimpleTestCase):
|
||||||
self.assertEqual(site._registry, {'lorem': 'ipsum'})
|
self.assertEqual(site._registry, {'lorem': 'ipsum'})
|
||||||
|
|
||||||
|
|
||||||
class TestFinder:
|
if PY310:
|
||||||
|
class TestFinder:
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
self.importer = zipimporter(*args, **kwargs)
|
||||||
|
|
||||||
|
def find_spec(self, path, target=None):
|
||||||
|
return self.importer.find_spec(path, target)
|
||||||
|
else:
|
||||||
|
class TestFinder:
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
self.importer = zipimporter(*args, **kwargs)
|
self.importer = zipimporter(*args, **kwargs)
|
||||||
|
|
||||||
|
@ -194,8 +203,7 @@ class TestFinder:
|
||||||
return
|
return
|
||||||
return TestLoader(importer)
|
return TestLoader(importer)
|
||||||
|
|
||||||
|
class TestLoader:
|
||||||
class TestLoader:
|
|
||||||
def __init__(self, importer):
|
def __init__(self, importer):
|
||||||
self.importer = importer
|
self.importer = importer
|
||||||
|
|
||||||
|
@ -207,9 +215,8 @@ class TestLoader:
|
||||||
|
|
||||||
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()
|
||||||
|
|
Loading…
Reference in New Issue