From a2e3eed53eb0338ad164f5cb84e8e2528635bf14 Mon Sep 17 00:00:00 2001 From: jmcfee Date: Thu, 25 Apr 2024 19:14:22 -0400 Subject: [PATCH] Fixed #35402 -- Fixed crash when DatabaseFeatures.django_test_skips references a class in another test module Previously, if a submodule skipped test classes in an adjacent submodule (same parent module), only the running submodule was imported and an error was thrown because getattr would not find the submodule of the to-be-skipped class. Updated cached_import in django/utils/module_loading.py to include a check for the skipped submodule, and import it if it is not there. Thanks to Tim Graham for reporting this bug --- AUTHORS | 1 + django/utils/module_loading.py | 5 +++++ tests/utils_tests/test_module_loading.py | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/AUTHORS b/AUTHORS index 56cda52202..fe45bce84c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -527,6 +527,7 @@ answer newbie questions, and generally made Django that much better: Jonathan Buchanan Jonathan Daugherty (cygnus) Jonathan Feignberg + Jonathan McFee Jonathan Slenders Jonny Park Jordan Bae diff --git a/django/utils/module_loading.py b/django/utils/module_loading.py index cb579e7f8c..adfd9f35d1 100644 --- a/django/utils/module_loading.py +++ b/django/utils/module_loading.py @@ -13,6 +13,11 @@ def cached_import(module_path, class_name): and getattr(spec, "_initializing", False) is False ): module = import_module(module_path) + if not hasattr(module, class_name): + try: + import_module(f"{module_path}.{class_name}") + except ImportError: + pass return getattr(module, class_name) diff --git a/tests/utils_tests/test_module_loading.py b/tests/utils_tests/test_module_loading.py index 80ada3abd7..42f07481f7 100644 --- a/tests/utils_tests/test_module_loading.py +++ b/tests/utils_tests/test_module_loading.py @@ -133,6 +133,10 @@ class ModuleImportTests(SimpleTestCase): cls = import_string("django.utils.module_loading.import_string") self.assertEqual(cls, import_string) + import_string("utils_tests.test_module.main_module") + good_module = import_string("utils_tests.test_module.good_module") + self.assertEqual(good_module.content, "Good Module") + # Test exceptions raised with self.assertRaises(ImportError): import_string("no_dots_in_path")