Skip to content

gh-95754: Better AttributeError on partially initialised module #112577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hauntsaninja merged 7 commits into from
Dec 21, 2023
Merged

gh-95754: Better AttributeError on partially initialised module #112577

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e339ae
gh-95754: Better AttributeError on partially initialised module
hauntsaninja Dec 1, 2023
7222653
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 1, 2023
a1c7198
code review
hauntsaninja Dec 1, 2023
3bac475
return null
hauntsaninja Dec 4, 2023
7ffb4a9
Merge remote-tracking branch 'upstream/main' into gh95754
hauntsaninja Dec 18, 2023
e043b30
rebase changes
hauntsaninja Dec 18, 2023
5e27a8f
Update Objects/moduleobject.c
serhiy-storchaka Dec 18, 2023
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
Prev Previous commit
Next Next commit
code review
  • Loading branch information
@hauntsaninja
hauntsaninja committed Dec 1, 2023
commit a1c7198e4dee1e07357a42ccdebf45deefc5c4ac
22 changes: 13 additions & 9 deletions Objects/moduleobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,22 +841,26 @@ _Py_module_getattro_impl(PyModuleObject *m, PyObject *name, int suppress)
}
if (suppress != 1) {
if (_PyModuleSpec_IsInitializing(spec)) {
origin = PyObject_GetAttr(spec, &_Py_ID(origin));
if (origin == NULL || origin == Py_None) {
PyErr_Format(PyExc_AttributeError,
"partially initialized "
"module '%U' has no attribute '%U' "
"(most likely due to a circular import)",
mod_name, name);
int valid_spec = PyObject_GetOptionalAttr(spec, &_Py_ID(origin), &origin);
// check if origin is a str object
if (valid_spec == 1 && !PyUnicode_Check(origin)) {
valid_spec = 0;
Py_DECREF(origin);
}
else {
if (valid_spec == 1) {
PyErr_Format(PyExc_AttributeError,
"partially initialized "
"module '%U' from '%U' has no attribute '%U' "
"(most likely due to a circular import)",
mod_name, origin, name);
Py_DECREF(origin);
} else {
PyErr_Format(PyExc_AttributeError,
"partially initialized "
"module '%U' has no attribute '%U' "
"(most likely due to a circular import)",
mod_name, name);
}
Py_XDECREF(origin);
}
else if (_PyModuleSpec_IsUninitializedSubmodule(spec, name)) {
PyErr_Format(PyExc_AttributeError,
Expand Down