mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-23 01:25:58 +00:00
Code Issues 25 Releases Wiki Activity

added comment and updated unit test

Browse Source
This commit is contained in:
jmcfee 2024-05-31 01:03:53 -04:00
parent a2e3eed53e
commit d21dc2ed7e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/utils/module_loading.py
View File

@ -5,7 +5,7 @@ from importlib import import_module
from importlib.util import find_spec as importlib_find from importlib.util import find_spec as importlib_find
def cached_import(module_path, class_name): def cached_import(module_path, attribute):
# Check whether module is loaded and fully initialized. # Check whether module is loaded and fully initialized.
if not ( if not (
(module := sys.modules.get(module_path)) (module := sys.modules.get(module_path))
@ -13,12 +13,13 @@ def cached_import(module_path, class_name):
and getattr(spec, "_initializing", False) is False and getattr(spec, "_initializing", False) is False
): ):
module = import_module(module_path) module = import_module(module_path)
if not hasattr(module, class_name): # Check whether attribute has been explicitly imported
if not hasattr(module, attribute):
try: try:
import_module(f"{module_path}.{class_name}") import_module(f"{module_path}.{attribute}")
except ImportError: except ImportError:
pass pass
return getattr(module, class_name) return getattr(module, attribute)
def import_string(dotted_path): def import_string(dotted_path):

7
tests/utils_tests/test_module_loading.py
View File

@ -137,6 +137,13 @@ class ModuleImportTests(SimpleTestCase):
good_module = import_string("utils_tests.test_module.good_module") good_module = import_string("utils_tests.test_module.good_module")
self.assertEqual(good_module.content, "Good Module") self.assertEqual(good_module.content, "Good Module")
sys.modules.pop("utils_tests.test_module")
import_string("utils_tests.test_module")
another_good_module = import_string(
"utils_tests.test_module.another_good_module"
)
self.assertEqual(another_good_module.content, "Another Good Module")
# Test exceptions raised # Test exceptions raised
with self.assertRaises(ImportError): with self.assertRaises(ImportError):
import_string("no_dots_in_path") import_string("no_dots_in_path")