Commit d485d418 authored by Stefan Behnel's avatar Stefan Behnel

work-around to fix ticket #228 at least work in Py2.x, while still preventing crashes in Py3

parent a9358680
...@@ -5425,15 +5425,22 @@ static INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *t ...@@ -5425,15 +5425,22 @@ static INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *t
PyObject *tmp_type, *tmp_value, *tmp_tb; PyObject *tmp_type, *tmp_value, *tmp_tb;
PyThreadState *tstate = PyThreadState_GET(); PyThreadState *tstate = PyThreadState_GET();
#if PY_MAJOR_VERSION >= 3
/* Note: this is a temporary work-around to prevent crashes in Python 3.0 */
if ((tstate->exc_type != NULL) & (tstate->exc_type != Py_None)) {
tmp_type = tstate->exc_type; tmp_type = tstate->exc_type;
tmp_value = tstate->exc_value; tmp_value = tstate->exc_value;
tmp_tb = tstate->exc_traceback; tmp_tb = tstate->exc_traceback;
PyErr_NormalizeException(&type, &value, &tb);
PyErr_NormalizeException(&tmp_type, &tmp_value, &tmp_tb);
tstate->exc_type = 0; tstate->exc_type = 0;
tstate->exc_value = 0; tstate->exc_value = 0;
tstate->exc_traceback = 0; tstate->exc_traceback = 0;
Py_XDECREF(tmp_type); PyException_SetContext(value, tmp_value);
Py_XDECREF(tmp_value); Py_DECREF(tmp_type);
Py_XDECREF(tmp_tb); Py_XDECREF(tmp_tb);
}
#endif
tmp_type = tstate->curexc_type; tmp_type = tstate->curexc_type;
tmp_value = tstate->curexc_value; tmp_value = tstate->curexc_value;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment