Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Lib/test/test_lazy_import/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,21 @@ def test_lazy_modules_is_per_interpreter(self):
# Basic test that sys.lazy_modules exists and is a set
self.assertIsInstance(sys.lazy_modules, dict)

def test_lazy_module_without_children_is_tracked(self):
code = textwrap.dedent("""
import sys
lazy import json
assert "json" in sys.lazy_modules, (
f"expected 'json' in sys.lazy_modules, got {set(sys.lazy_modules)}"
)
assert sys.lazy_modules["json"] == set(), (
f"expected empty set for sys.lazy_modules['json'], "
f"got {sys.lazy_modules['json']!r}"
)
print("OK")
""")
assert_python_ok("-c", code)


@support.requires_subprocess()
class CommandLineAndEnvVarTests(unittest.TestCase):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed ``sys.lazy_modules`` to include lazy modules without submodules. Patch by Bartosz Sławecki.
6 changes: 6 additions & 0 deletions Python/import.c
Original file line number Diff line number Diff line change
Expand Up @@ -4377,6 +4377,12 @@ register_lazy_on_parent(PyThreadState *tstate, PyObject *name,
Py_ssize_t dot = PyUnicode_FindChar(name, '.', 0,
PyUnicode_GET_LENGTH(name), -1);
if (dot < 0) {
PyObject *lazy_submodules = ensure_lazy_submodules(
(PyDictObject *)lazy_modules, name);
if (lazy_submodules == NULL) {
goto done;
}
Py_DECREF(lazy_submodules);
ret = 0;
goto done;
}
Expand Down
Loading