diff options
| author | Barry Warsaw <barry@python.org> | 1997-08-28 22:36:40 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 1997-08-28 22:36:40 (GMT) |
| commit | eaedc7ce3296becb466fd42fa07319e9c43771a0 (patch) | |
| tree | a5a12f2c60db7141fb22d59ef5e6b7d037d46865 | |
| parent | c1f088201f5a2a69b0d2045123a61d27406dfb8a (diff) | |
| download | cpython-eaedc7ce3296becb466fd42fa07319e9c43771a0.zip cpython-eaedc7ce3296becb466fd42fa07319e9c43771a0.tar.gz cpython-eaedc7ce3296becb466fd42fa07319e9c43771a0.tar.bz2 | |
eval_code2(), set_exc_info(): Call PyErr_NormalizeException() the
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!).
| -rw-r--r-- | Python/ceval.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index c920d30..7c1d407 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1795,6 +1795,8 @@ eval_code2(co, globals, locals, Python main loop. Don't do this for 'finally'. */ if (b->b_type == SETUP_EXCEPT) { + PyErr_NormalizeException( + &exc, &val, &tb); set_exc_info(tstate, exc, val, tb); } @@ -1875,8 +1877,6 @@ set_exc_info(tstate, type, value, tb) PyFrameObject *frame; PyObject *tmp_type, *tmp_value, *tmp_tb; - PyErr_NormalizeException(&type, &value, &tb); - frame = tstate->frame; if (frame->f_exc_type == NULL) { /* This frame didn't catch an exception before */ |