From: Barry Warsaw <barry@python.org>
Date: Thu, 28 Aug 1997 22:36:40 +0000 (+0000)
Subject: eval_code2(), set_exc_info(): Call PyErr_NormalizeException() the
X-Git-Tag: v1.5a4~287
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eaedc7ce3296becb466fd42fa07319e9c43771a0;p=python

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!).
---

diff --git a/Python/ceval.c b/Python/ceval.c
index c920d30a3a..7c1d407f19 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 */