mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-03 15:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Implicit exception chaining via __context__ (PEP 3134).

Browse source 
Patch 3108 by Antooine Pitrou.
This commit is contained in:
Guido van Rossum 2008-06-14 20:20:24 +00:00
parent 973124fd70
commit b4fb6e4d27
4 changed files with 139 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Python/ceval.c
View file

@ -2817,11 +2817,12 @@ fail: /* Jump here from prelude on failure */
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 @@ do_raise(PyObject *exc, PyObject *cause)
goto raise_error;
}
tb = PyException_GetTraceback(value);
if (cause) {
PyObject *fixed_cause;
if (PyExceptionClass_Check(cause)) {
@ -2883,13 +2883,15 @@ do_raise(PyObject *exc, PyObject *cause)
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;
}