Skip to content

gh-110721: Use the traceback module for PyErr_Display() and fallback to the C implementation #110702

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
pablogsal merged 13 commits into from
Oct 12, 2023
Merged

gh-110721: Use the traceback module for PyErr_Display() and fallback to the C implementation #110702

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
290280b
Use the traceback module for PyErr_Display() and fallback to the C im…
pablogsal Oct 11, 2023
987988d
Remove old macros
pablogsal Oct 11, 2023
2292ab3
Add tests for the fallback option
pablogsal Oct 11, 2023
2ab2168
fixup! Add tests for the fallback option
pablogsal Oct 11, 2023
e151717
fixup! fixup! Add tests for the fallback option
pablogsal Oct 11, 2023
7d57970
fixup! fixup! fixup! Add tests for the fallback option
pablogsal Oct 11, 2023
c812a3c
fixup! fixup! fixup! fixup! Add tests for the fallback option
pablogsal Oct 11, 2023
d55b7e7
fixup! fixup! fixup! fixup! fixup! Add tests for the fallback option
pablogsal Oct 11, 2023
a65d281
fixup! fixup! fixup! fixup! fixup! fixup! Add tests for the fallback …
pablogsal Oct 11, 2023
4d438ec
fixup! fixup! fixup! fixup! fixup! fixup! fixup! Add tests for the fa…
pablogsal Oct 12, 2023
dab41fb
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Add tests for…
pablogsal Oct 12, 2023
a6eb00e
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Add te…
pablogsal Oct 12, 2023
d74b837
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup!…
pablogsal Oct 12, 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
fixup! Add tests for the fallback option
  • Loading branch information
@pablogsal
pablogsal committed Oct 11, 2023
commit 2ab21688ce50298ff143f74d90fed63b2311d690
4 changes: 0 additions & 4 deletions Python/pythonrun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,6 @@ struct exception_print_context
{
PyObject *file;
PyObject *seen; // Prevent cycles in recursion
bool need_close; // Need a closing bottom frame
};

static int
Expand Down Expand Up @@ -926,9 +925,7 @@ print_chained(struct exception_print_context* ctx, PyObject *value,
if (_Py_EnterRecursiveCall(" in print_chained")) {
return -1;
}
bool need_close = ctx->need_close;
int res = print_exception_recursive(ctx, value);
ctx->need_close = need_close;
_Py_LeaveRecursiveCall();
if (res < 0) {
return -1;
Expand Down Expand Up @@ -1099,7 +1096,6 @@ _PyErr_Display(PyObject *file, PyObject *unused, PyObject *value, PyObject *tb)

struct exception_print_context ctx;
ctx.file = file;
ctx.need_close = false;

/* We choose to ignore seen being possibly NULL, and report
at least the main exception (it could be a MemoryError).
Expand Down