Commit 80160d01 authored by Stefan Behnel's avatar Stefan Behnel

Tighten Py3.7 guard for new "exc_state" struct usage.

parent 2d339246
...@@ -359,7 +359,7 @@ static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb) ...@@ -359,7 +359,7 @@ static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb)
*value = local_value; *value = local_value;
*tb = local_tb; *tb = local_tb;
#if CYTHON_FAST_THREAD_STATE #if CYTHON_FAST_THREAD_STATE
#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 7 #if PY_VERSION_HEX >= 0x030700A2
tmp_type = tstate->exc_state.exc_type; tmp_type = tstate->exc_state.exc_type;
tmp_value = tstate->exc_state.exc_value; tmp_value = tstate->exc_state.exc_value;
tmp_tb = tstate->exc_state.exc_traceback; tmp_tb = tstate->exc_state.exc_traceback;
...@@ -403,7 +403,7 @@ static CYTHON_INLINE void __Pyx_ReraiseException(void) { ...@@ -403,7 +403,7 @@ static CYTHON_INLINE void __Pyx_ReraiseException(void) {
PyObject *type = NULL, *value = NULL, *tb = NULL; PyObject *type = NULL, *value = NULL, *tb = NULL;
#if CYTHON_FAST_THREAD_STATE #if CYTHON_FAST_THREAD_STATE
PyThreadState *tstate = PyThreadState_GET(); PyThreadState *tstate = PyThreadState_GET();
#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 7 #if PY_VERSION_HEX >= 0x030700A2
type = tstate->exc_state.exc_type; type = tstate->exc_state.exc_type;
value = tstate->exc_state.exc_value; value = tstate->exc_state.exc_value;
tb = tstate->exc_state.exc_traceback; tb = tstate->exc_state.exc_traceback;
...@@ -455,7 +455,7 @@ static CYTHON_INLINE void __Pyx__ExceptionReset(PyThreadState *tstate, PyObject ...@@ -455,7 +455,7 @@ static CYTHON_INLINE void __Pyx__ExceptionReset(PyThreadState *tstate, PyObject
#if CYTHON_FAST_THREAD_STATE #if CYTHON_FAST_THREAD_STATE
static CYTHON_INLINE void __Pyx__ExceptionSave(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) { static CYTHON_INLINE void __Pyx__ExceptionSave(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) {
#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 7 #if PY_VERSION_HEX >= 0x030700A2
*type = tstate->exc_state.exc_type; *type = tstate->exc_state.exc_type;
*value = tstate->exc_state.exc_value; *value = tstate->exc_state.exc_value;
*tb = tstate->exc_state.exc_traceback; *tb = tstate->exc_state.exc_traceback;
...@@ -472,7 +472,7 @@ static CYTHON_INLINE void __Pyx__ExceptionSave(PyThreadState *tstate, PyObject * ...@@ -472,7 +472,7 @@ static CYTHON_INLINE void __Pyx__ExceptionSave(PyThreadState *tstate, PyObject *
static CYTHON_INLINE void __Pyx__ExceptionReset(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb) { static CYTHON_INLINE void __Pyx__ExceptionReset(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb) {
PyObject *tmp_type, *tmp_value, *tmp_tb; PyObject *tmp_type, *tmp_value, *tmp_tb;
#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 7 #if PY_VERSION_HEX >= 0x030700A2
tmp_type = tstate->exc_state.exc_type; tmp_type = tstate->exc_state.exc_type;
tmp_value = tstate->exc_state.exc_value; tmp_value = tstate->exc_state.exc_value;
tmp_tb = tstate->exc_state.exc_traceback; tmp_tb = tstate->exc_state.exc_traceback;
...@@ -510,7 +510,7 @@ static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, ...@@ -510,7 +510,7 @@ static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value,
static CYTHON_INLINE void __Pyx__ExceptionSwap(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) { static CYTHON_INLINE void __Pyx__ExceptionSwap(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) {
PyObject *tmp_type, *tmp_value, *tmp_tb; PyObject *tmp_type, *tmp_value, *tmp_tb;
#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 7 #if PY_VERSION_HEX >= 0x030700A2
tmp_type = tstate->exc_state.exc_type; tmp_type = tstate->exc_state.exc_type;
tmp_value = tstate->exc_state.exc_value; tmp_value = tstate->exc_state.exc_value;
tmp_tb = tstate->exc_state.exc_traceback; tmp_tb = tstate->exc_state.exc_traceback;
...@@ -526,8 +526,8 @@ static CYTHON_INLINE void __Pyx__ExceptionSwap(PyThreadState *tstate, PyObject * ...@@ -526,8 +526,8 @@ static CYTHON_INLINE void __Pyx__ExceptionSwap(PyThreadState *tstate, PyObject *
tstate->exc_type = *type; tstate->exc_type = *type;
tstate->exc_value = *value; tstate->exc_value = *value;
tstate->exc_traceback = *tb; tstate->exc_traceback = *tb;
#endif #endif
*type = tmp_type; *type = tmp_type;
*value = tmp_value; *value = tmp_value;
*tb = tmp_tb; *tb = tmp_tb;
......
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