mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

eval_code2(), set_exc_info(): Call PyErr_NormalizeException() the

Browse source 
former rather than the latter, since PyErr_NormalizeException takes
PyObject** and I didn't want to change the interface for set_exc_info
(but I did want the changes propagated to eval_code2!).
This commit is contained in:
Barry Warsaw 1997-08-28 22:36:40 +00:00
parent c1f088201f
commit eaedc7ce32
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/ceval.c
View file

@ -1795,6 +1795,8 @@ eval_code2(co, globals, locals,
Python main loop. Don't do Python main loop. Don't do
this for 'finally'. */ this for 'finally'. */
if (b->b_type == SETUP_EXCEPT) { if (b->b_type == SETUP_EXCEPT) {
PyErr_NormalizeException(
&exc, &val, &tb);
set_exc_info(tstate, set_exc_info(tstate,
exc, val, tb); exc, val, tb);
} }
@ -1875,8 +1877,6 @@ set_exc_info(tstate, type, value, tb)
PyFrameObject *frame; PyFrameObject *frame;
PyObject *tmp_type, *tmp_value, *tmp_tb; PyObject *tmp_type, *tmp_value, *tmp_tb;
PyErr_NormalizeException(&type, &value, &tb);
frame = tstate->frame; frame = tstate->frame;
if (frame->f_exc_type == NULL) { if (frame->f_exc_type == NULL) {
/* This frame didn't catch an exception before */ /* This frame didn't catch an exception before */