diff --git a/Lib/test/test_lazy_import/__init__.py b/Lib/test/test_lazy_import/__init__.py index 6dd2f7c825e5dd3..dc25347d9c0f9ee 100644 --- a/Lib/test/test_lazy_import/__init__.py +++ b/Lib/test/test_lazy_import/__init__.py @@ -564,6 +564,30 @@ def denied(*args): exec('assert xml.dom.__name__ == "xml.dom"', first) """) + def test_import_hook_receives_binding_globals(self): + self.check(""" + import builtins, types + owner = types.ModuleType('owner') + calls = [] + def import_hook( + name, globals=None, locals=None, fromlist=(), level=0, + ): + calls.append((globals is owner.__dict__, locals is globals)) + module = types.ModuleType(name) + module.value = 42 + return module + owner.__dict__['__builtins__'] = dict( + vars(builtins), __import__=import_hook) + exec('lazy import target', owner.__dict__) + consumer = { + '__name__': 'consumer', + '__builtins__': vars(builtins), + 'owner': owner, + } + exec('assert owner.target.value == 42', consumer) + assert calls == [(True, True)], calls + """) + def test_retry_after_recursive_access(self): self.check(""" import sys, xml diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-11-22-11-55-30.gh-issue-162415.Qw7nLp.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-11-22-11-55-30.gh-issue-162415.Qw7nLp.rst new file mode 100644 index 000000000000000..12ba3e6d61c5d73 --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-11-22-11-55-30.gh-issue-162415.Qw7nLp.rst @@ -0,0 +1 @@ +Use the globals that own a lazy import binding when reifying it. diff --git a/Objects/lazyimportobject.c b/Objects/lazyimportobject.c index aafd2ce764a1cbc..20514abf2c5d7ac 100644 --- a/Objects/lazyimportobject.c +++ b/Objects/lazyimportobject.c @@ -366,7 +366,7 @@ _PyLazyImport_IsResolving(PyThreadState *tstate, PyObject *op) static PyObject * lazy_import_resolve_impl(PyThreadState *tstate, PyObject *lazy_import, - PyObject **imported_module) + PyObject **imported_module, PyObject *globals) { PyObject *obj = NULL; PyObject *fromlist = NULL; @@ -428,9 +428,11 @@ lazy_import_resolve_impl(PyThreadState *tstate, PyObject *lazy_import, goto done; } - PyObject *globals = PyEval_GetGlobals(); if (globals == NULL) { - globals = Py_None; + globals = PyEval_GetGlobals(); + if (globals == NULL) { + globals = Py_None; + } } if (PyMapping_GetOptionalItem(root->lz_builtins, &_Py_ID(__import__), @@ -564,7 +566,7 @@ lazy_import_resolve_impl(PyThreadState *tstate, PyObject *lazy_import, PyObject * _PyImport_LoadLazyImportTstate(PyThreadState *tstate, PyObject *lazy_import) { - return lazy_import_resolve_impl(tstate, lazy_import, NULL); + return lazy_import_resolve_impl(tstate, lazy_import, NULL, NULL); } // Resolve a pending child as an aliased import, preserving its declaration. @@ -671,8 +673,9 @@ _PyLazyImport_Reify(PyThreadState *tstate, PyObject *placeholder, PyObject *name, PyObject *namespace) { PyObject *imported_module = NULL; + PyObject *globals = PyDict_Check(namespace) ? namespace : NULL; PyObject *value = lazy_import_resolve_impl( - tstate, placeholder, &imported_module); + tstate, placeholder, &imported_module, globals); if (value == NULL) { Py_XDECREF(imported_module); return NULL;