Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[3.13] gh-128799: Add frame of except* to traceback when wrapping a naked exception (#128971) #129299

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 8 commits into from
Jan 30, 2025
Merged

[3.13] gh-128799: Add frame of except* to traceback when wrapping a naked exception (#128971) #129299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
73f520d
gh-128799: Add frame of except* to traceback when wrapping a naked ex…
iritkatriel Jan 25, 2025
fe53458
Merge branch '3.13' into backport-c39ae89-3.13
iritkatriel Jan 27, 2025
5be338e
Merge branch '3.13' into backport-c39ae89-3.13
Eclips4 Jan 27, 2025
da0b022
Merge branch '3.13' into backport-c39ae89-3.13
iritkatriel Jan 29, 2025
ac173b7
avoid changing ABI
iritkatriel Jan 29, 2025
078036e
Revert "avoid changing ABI"
iritkatriel Jan 30, 2025
49eb82d
do not change signature
iritkatriel Jan 30, 2025
fc87462
Merge branch '3.13' into backport-c39ae89-3.13
iritkatriel Jan 30, 2025
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
27 changes: 27 additions & 0 deletions Lib/test/test_traceback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2938,6 +2938,33 @@ def exc():
report = self.get_report(exc)
self.assertEqual(report, expected)

def test_exception_group_wrapped_naked(self):
# See gh-128799

def exc():
try:
raise Exception(42)
except* Exception as e:
raise

expected = (f' + Exception Group Traceback (most recent call last):\n'
f' | File "{__file__}", line {self.callable_line}, in get_exception\n'
f' | exception_or_callable()\n'
f' | ~~~~~~~~~~~~~~~~~~~~~^^\n'
f' | File "{__file__}", line {exc.__code__.co_firstlineno + 3}, in exc\n'
f' | except* Exception as e:\n'
f' | raise\n'
f' | ExceptionGroup: (1 sub-exception)\n'
f' +-+---------------- 1 ----------------\n'
f' | Traceback (most recent call last):\n'
f' | File "{__file__}", line {exc.__code__.co_firstlineno + 2}, in exc\n'
f' | raise Exception(42)\n'
f' | Exception: 42\n'
f' +------------------------------------\n')

report = self.get_report(exc)
self.assertEqual(report, expected)

def test_KeyboardInterrupt_at_first_line_of_frame(self):
# see GH-93249
def f():
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2025-01-18-01-06-58.gh-issue-128799.vSNagk.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add frame of ``except*`` to traceback when it wraps a naked exception.
12 changes: 12 additions & 0 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "pycore_setobject.h" // _PySet_Update()
#include "pycore_sliceobject.h" // _PyBuildSlice_ConsumeRefs
#include "pycore_sysmodule.h" // _PySys_Audit()
#include "pycore_traceback.h" // _PyTraceBack_FromFrame
#include "pycore_tuple.h" // _PyTuple_ITEMS()
#include "pycore_typeobject.h" // _PySuper_Lookup()
#include "pycore_uop_ids.h" // Uops
Expand Down Expand Up @@ -2018,6 +2019,17 @@ _PyEval_ExceptionGroupMatch(PyObject* exc_value, PyObject *match_type,
if (wrapped == NULL) {
return -1;
}
PyThreadState *tstate = _PyThreadState_GET();
_PyInterpreterFrame *frame = _PyThreadState_GetFrame(tstate);
PyFrameObject *f = _PyFrame_GetFrameObject(frame);
if (f != NULL) {
PyObject *tb = _PyTraceBack_FromFrame(NULL, f);
if (tb == NULL) {
return -1;
}
PyException_SetTraceback(wrapped, tb);
Py_DECREF(tb);
}
*match = wrapped;
}
*rest = Py_NewRef(Py_None);
Expand Down
Loading