8000 gh-127651: Use __file__ in diagnostics if origin is missing by hauntsaninja · Pull Request #127660 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-127651: Use __file__ in diagnostics if origin is missing #127660

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
merged 15 commits into from
Dec 10, 2024
Merged

gh-127651: Use __file__ in diagnostics if origin is missing #127660

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
363567c
gh-127651: Use __file__ in diagnostics if origin is missing
hauntsaninja Dec 6, 2024
69be54a
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 6, 2024
e5bab4c
fix news entry
hauntsaninja Dec 6, 2024
0688e77
use os.__file__ in test
hauntsaninja Dec 9, 2024
7c30a5d
add test for error path
hauntsaninja Dec 9, 2024
9a3dbbf
add test for missing __file__
hauntsaninja Dec 9, 2024
33e3fb6
use mortal objects
hauntsaninja Dec 9, 2024
fb1d381
remove regex use
hauntsaninja Dec 9, 2024
247565e
remove tmp dir
hauntsaninja Dec 9, 2024
2bd25a8
move call earlier
hauntsaninja Dec 9, 2024
8a5f76a
test with sys
hauntsaninja Dec 9, 2024
c80120e
errmsg null check
hauntsaninja Dec 9, 2024
e8da759
improve test
hauntsaninja Dec 9, 2024
d5aa69c
Update Python/ceval.c
hauntsaninja Dec 9, 2024
560a23c
more origin test
hauntsaninja Dec 9, 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
Next Next commit
errmsg null check
  • Loading branch information
@hauntsaninja
hauntsaninja committed Dec 9, 2024
commit c80120ec1d518faf2e2df7b3b863ffa8a5d57a15
8 changes: 5 additions & 3 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2933,9 +2933,11 @@ _PyEval_ImportFrom(PyThreadState *tstate, PyObject *v, PyObject *name)
}

done_with_errmsg:
/* NULL checks for errmsg, mod_name, origin done by PyErr_SetImportError. */
_PyErr_SetImportErrorWithNameFrom(errmsg, mod_name, origin, name);
Py_DECREF(errmsg);
if (errmsg != NULL) {
/* NULL checks for errmsg, mod_name, origin done by _PyErr_SetImportErrorWithNameFrom */
_PyErr_SetImportErrorWithNameFrom(errmsg, mod_name, origin, name);
Py_DECREF(errmsg);
}

done:
Py_XDECREF(origin);
Expand Down
Loading
0