Skip to content

gh-128030: Avoid error from PyModule_GetFilenameObject for non-module #128047

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 3 commits into from
Dec 20, 2024
Merged

gh-128030: Avoid error from PyModule_GetFilenameObject for non-module #128047

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
256e3c3
gh-128030: Avoid error from PyModule_GetFilenameObject for non-module
hauntsaninja Dec 17, 2024
389e3bc
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 17, 2024
f7dfafc
.
hauntsaninja Dec 18, 2024
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
.
  • Loading branch information
@hauntsaninja
hauntsaninja committed Dec 18, 2024
commit f7dfafcbe34e7e99112485fa8a0886b8478ce7f1
16 changes: 7 additions & 9 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2860,18 +2860,16 @@ _PyEval_ImportFrom(PyThreadState *tstate, PyObject *v, PyObject *name)
}
}

if (origin == NULL) {
if (origin == NULL && PyModule_Check(v)) {
// Fall back to __file__ for diagnostics if we don't have
// an origin that is a location
if (PyModule_Check(v)) {
origin = PyModule_GetFilenameObject(v);
if (origin == NULL) {
if (!PyErr_ExceptionMatches(PyExc_SystemError)) {
goto done;
}
// PyModule_GetFilenameObject raised "module filename missing"
_PyErr_Clear(tstate);
origin = PyModule_GetFilenameObject(v);
if (origin == NULL) {
if (!PyErr_ExceptionMatches(PyExc_SystemError)) {
goto done;
}
// PyModule_GetFilenameObject raised "module filename missing"
_PyErr_Clear(tstate);
}
assert(origin == NULL || PyUnicode_Check(origin));
}
Expand Down