Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move eager check for from imports into import from

Browse source
This commit is contained in:
Dino Viehland 2025-10-02 13:36:18 -07:00
parent 7d07ae13d7
commit c63198cba4
5 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Python/ceval.c
View file

@ -3304,6 +3304,22 @@ _PyEval_LazyImportFrom(PyThreadState *tstate, PyObject *v, PyObject *name)
assert(name && PyUnicode_Check(name));
PyObject *ret;
PyLazyImportObject *d = (PyLazyImportObject *)v;
PyObject *mod = PyImport_GetModule(d->lz_from);
if (mod != NULL) {
// Check if the module already has the attribute, if so, resolve it eagerly.
if (PyModule_Check(mod)) {
PyObject *mod_dict = PyModule_GetDict(mod);
if (mod_dict != NULL) {
if (PyDict_GetItemRef(mod_dict, name, &ret) < 0) {
return NULL;
} else if (ret != NULL) {
return ret;
}
}
}
Py_DECREF(mod);
}
if (d->lz_attr != NULL) {
if (PyUnicode_Check(d->lz_attr)) {
PyObject *from = PyUnicode_FromFormat("%U.%U", d->lz_from, d->lz_attr);

10
Python/import.c
View file

@ -4221,16 +4221,8 @@ _PyImport_LazyImportModuleLevelObject(PyThreadState *tstate,
}
PyInterpreterState *interp = tstate->interp;
_PyInterpreterFrame *frame = _PyEval_GetFrame();
assert(frame->f_globals == frame->f_locals); // should only be called in global scope
PyObject *mod = PyImport_GetModule(abs_name);
bool already_exists = mod != NULL;
Py_XDECREF(mod);
if (mod != NULL) {
return PyImport_ImportModuleLevelObject(name, globals, locals, fromlist, level);
}
// Check if the filter disables the lazy import
PyObject *filter = LAZY_IMPORTS_FILTER(interp);
if (filter != NULL) {
@ -4262,7 +4254,7 @@ _PyImport_LazyImportModuleLevelObject(PyThreadState *tstate,
}
PyObject *res = _PyLazyImport_New(import_func, abs_name, fromlist);
if (!already_exists && register_lazy_on_parent(tstate, abs_name, import_func) < 0) {
if (register_lazy_on_parent(tstate, abs_name, import_func) < 0) {
Py_DECREF(res);
res = NULL;
}