Implicit exception chaining via __context__ (PEP 3134).
Patch 3108 by Antooine Pitrou.
diff --git a/Python/ceval.c b/Python/ceval.c
index bcb15e7..6aaa52d 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2817,11 +2817,12 @@
static enum why_code
do_raise(PyObject *exc, PyObject *cause)
{
- PyObject *type = NULL, *value = NULL, *tb = NULL;
+ PyObject *type = NULL, *value = NULL;
if (exc == NULL) {
/* Reraise */
PyThreadState *tstate = PyThreadState_GET();
+ PyObject *tb;
type = tstate->exc_type;
value = tstate->exc_value;
tb = tstate->exc_traceback;
@@ -2862,7 +2863,6 @@
goto raise_error;
}
- tb = PyException_GetTraceback(value);
if (cause) {
PyObject *fixed_cause;
if (PyExceptionClass_Check(cause)) {
@@ -2883,13 +2883,15 @@
PyException_SetCause(value, fixed_cause);
}
- PyErr_Restore(type, value, tb);
+ PyErr_SetObject(type, value);
+ /* PyErr_SetObject incref's its arguments */
+ Py_XDECREF(value);
+ Py_XDECREF(type);
return WHY_EXCEPTION;
raise_error:
Py_XDECREF(value);
Py_XDECREF(type);
- Py_XDECREF(tb);
Py_XDECREF(cause);
return WHY_EXCEPTION;
}