From a3185a670169eb67f1ce5c774fe7af555f80163b Mon Sep 17 00:00:00 2001 From: Nick Pope Date: Mon, 4 Oct 2021 06:47:49 +0100 Subject: [PATCH] Refs #33107 -- Optimized cached_import() helper. --- django/utils/module_loading.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/django/utils/module_loading.py b/django/utils/module_loading.py index d42b9a5f22..bf099cba96 100644 --- a/django/utils/module_loading.py +++ b/django/utils/module_loading.py @@ -6,14 +6,14 @@ from importlib.util import find_spec as importlib_find def cached_import(module_path, class_name): - modules = sys.modules - if module_path not in modules or ( - # Module is not fully initialized. - getattr(modules[module_path], '__spec__', None) is not None and - getattr(modules[module_path].__spec__, '_initializing', False) is True + # Check whether module is loaded and fully initialized. + if not ( + (module := sys.modules.get(module_path)) and + (spec := getattr(module, '__spec__', None)) and + getattr(spec, '_initializing', False) is False ): - import_module(module_path) - return getattr(modules[module_path], class_name) + module = import_module(module_path) + return getattr(module, class_name) def import_string(dotted_path):