mirror of https://github.com/python/cpython
Issue 24342: No need to use PyAPI_FUNC for _PyEval_ApplyCoroutineWrapper
(Merge 3.5)
This commit is contained in:
commit
a641def110
|
@ -25,7 +25,6 @@ PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *);
|
||||||
PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *);
|
PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *);
|
||||||
PyAPI_FUNC(void) _PyEval_SetCoroutineWrapper(PyObject *);
|
PyAPI_FUNC(void) _PyEval_SetCoroutineWrapper(PyObject *);
|
||||||
PyAPI_FUNC(PyObject *) _PyEval_GetCoroutineWrapper(void);
|
PyAPI_FUNC(PyObject *) _PyEval_GetCoroutineWrapper(void);
|
||||||
PyAPI_FUNC(PyObject *) _PyEval_ApplyCoroutineWrapper(PyObject *);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct _frame; /* Avoid including frameobject.h */
|
struct _frame; /* Avoid including frameobject.h */
|
||||||
|
|
|
@ -146,6 +146,8 @@ static void format_exc_unbound(PyCodeObject *co, int oparg);
|
||||||
static PyObject * unicode_concatenate(PyObject *, PyObject *,
|
static PyObject * unicode_concatenate(PyObject *, PyObject *,
|
||||||
PyFrameObject *, unsigned char *);
|
PyFrameObject *, unsigned char *);
|
||||||
static PyObject * special_lookup(PyObject *, _Py_Identifier *);
|
static PyObject * special_lookup(PyObject *, _Py_Identifier *);
|
||||||
|
static PyObject * apply_coroutine_wrapper(PyObject *);
|
||||||
|
|
||||||
|
|
||||||
#define NAME_ERROR_MSG \
|
#define NAME_ERROR_MSG \
|
||||||
"name '%.200s' is not defined"
|
"name '%.200s' is not defined"
|
||||||
|
@ -3935,7 +3937,7 @@ _PyEval_EvalCodeWithName(PyObject *_co, PyObject *globals, PyObject *locals,
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (co->co_flags & (CO_COROUTINE | CO_ITERABLE_COROUTINE))
|
if (co->co_flags & (CO_COROUTINE | CO_ITERABLE_COROUTINE))
|
||||||
return _PyEval_ApplyCoroutineWrapper(gen);
|
return apply_coroutine_wrapper(gen);
|
||||||
|
|
||||||
return gen;
|
return gen;
|
||||||
}
|
}
|
||||||
|
@ -4401,33 +4403,6 @@ _PyEval_GetCoroutineWrapper(void)
|
||||||
return tstate->coroutine_wrapper;
|
return tstate->coroutine_wrapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
PyObject *
|
|
||||||
_PyEval_ApplyCoroutineWrapper(PyObject *gen)
|
|
||||||
{
|
|
||||||
PyObject *wrapped;
|
|
||||||
PyThreadState *tstate = PyThreadState_GET();
|
|
||||||
PyObject *wrapper = tstate->coroutine_wrapper;
|
|
||||||
|
|
||||||
if (tstate->in_coroutine_wrapper) {
|
|
||||||
assert(wrapper != NULL);
|
|
||||||
PyErr_Format(PyExc_RuntimeError,
|
|
||||||
"coroutine wrapper %.150R attempted "
|
|
||||||
"to recursively wrap %.150R",
|
|
||||||
wrapper,
|
|
||||||
gen);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (wrapper == NULL) {
|
|
||||||
return gen;
|
|
||||||
}
|
|
||||||
|
|
||||||
tstate->in_coroutine_wrapper = 1;
|
|
||||||
wrapped = PyObject_CallFunction(wrapper, "N", gen);
|
|
||||||
tstate->in_coroutine_wrapper = 0;
|
|
||||||
return wrapped;
|
|
||||||
}
|
|
||||||
|
|
||||||
PyObject *
|
PyObject *
|
||||||
PyEval_GetBuiltins(void)
|
PyEval_GetBuiltins(void)
|
||||||
{
|
{
|
||||||
|
@ -5257,6 +5232,33 @@ unicode_concatenate(PyObject *v, PyObject *w,
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
apply_coroutine_wrapper(PyObject *gen)
|
||||||
|
{
|
||||||
|
PyObject *wrapped;
|
||||||
|
PyThreadState *tstate = PyThreadState_GET();
|
||||||
|
PyObject *wrapper = tstate->coroutine_wrapper;
|
||||||
|
|
||||||
|
if (tstate->in_coroutine_wrapper) {
|
||||||
|
assert(wrapper != NULL);
|
||||||
|
PyErr_Format(PyExc_RuntimeError,
|
||||||
|
"coroutine wrapper %.200R attempted "
|
||||||
|
"to recursively wrap %.200R",
|
||||||
|
wrapper,
|
||||||
|
gen);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (wrapper == NULL) {
|
||||||
|
return gen;
|
||||||
|
}
|
||||||
|
|
||||||
|
tstate->in_coroutine_wrapper = 1;
|
||||||
|
wrapped = PyObject_CallFunction(wrapper, "N", gen);
|
||||||
|
tstate->in_coroutine_wrapper = 0;
|
||||||
|
return wrapped;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef DYNAMIC_EXECUTION_PROFILE
|
#ifdef DYNAMIC_EXECUTION_PROFILE
|
||||||
|
|
||||||
static PyObject *
|
static PyObject *
|
||||||
|
|
Loading…
Reference in New Issue