diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-04-19 16:57:54 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-04-19 16:57:54 (GMT) |
| commit | f097f175dd3385e6e43842680932b32cbc50365d (patch) | |
| tree | 9f0792a864e03c4e1ed58bb4f0819bfb40be2d0f /Python | |
| parent | 24aa15959b0f8b540dc4c2eacf31755e506ab3b5 (diff) | |
| parent | 3583761bcd3ebc85207f555017e06f2007cd0db0 (diff) | |
| download | cpython-f097f175dd3385e6e43842680932b32cbc50365d.zip cpython-f097f175dd3385e6e43842680932b32cbc50365d.tar.gz cpython-f097f175dd3385e6e43842680932b32cbc50365d.tar.bz2 | |
Merge #17413: make sure settrace funcs get passed exception instances for 'value'.
Patch by Ingrid Cheung and Brendan McLoughlin.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 6132e16..138c75d 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -3793,6 +3793,7 @@ call_exc_trace(Py_tracefunc func, PyObject *self, PyFrameObject *f) value = Py_None; Py_INCREF(value); } + PyErr_NormalizeException(&type, &value, &traceback); arg = PyTuple_Pack(3, type, value, traceback); if (arg == NULL) { PyErr_Restore(type, value, traceback); |