diff options
| author | Mark Shannon <mark@hotpy.org> | 2017-10-22 21:41:51 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <pitrou@free.fr> | 2017-10-22 21:41:51 (GMT) |
| commit | ae3087c6382011c47db82fea4d05f8bbf514265d (patch) | |
| tree | c5d832a760d9898700f1ca397a5a305734b3d77a /Python/sysmodule.c | |
| parent | 91dc64ba3f51100540b2ab6c6cd72c3bb18a6d49 (diff) | |
| download | cpython-ae3087c6382011c47db82fea4d05f8bbf514265d.zip cpython-ae3087c6382011c47db82fea4d05f8bbf514265d.tar.gz cpython-ae3087c6382011c47db82fea4d05f8bbf514265d.tar.bz2 | |
Move exc state to generator. Fixes bpo-25612 (#1773)
Move exception state information from frame objects to coroutine (generator/thread) object where it belongs.
Diffstat (limited to 'Python/sysmodule.c')
| -rw-r--r-- | Python/sysmodule.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index e38a200..6dc8e08 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -311,14 +311,13 @@ PyDoc_STRVAR(excepthook_doc, static PyObject * sys_exc_info(PyObject *self, PyObject *noargs) { - PyThreadState *tstate; - tstate = PyThreadState_GET(); + _PyErr_StackItem *err_info = _PyErr_GetTopmostException(PyThreadState_GET()); return Py_BuildValue( "(OOO)", - tstate->exc_type != NULL ? tstate->exc_type : Py_None, - tstate->exc_value != NULL ? tstate->exc_value : Py_None, - tstate->exc_traceback != NULL ? - tstate->exc_traceback : Py_None); + err_info->exc_type != NULL ? err_info->exc_type : Py_None, + err_info->exc_value != NULL ? err_info->exc_value : Py_None, + err_info->exc_traceback != NULL ? + err_info->exc_traceback : Py_None); } PyDoc_STRVAR(exc_info_doc, |