[Python-checkins] cpython (merge 3.5 -> default): Issue 24342: No need to use PyAPI_FUNC for _PyEval_ApplyCoroutineWrapper

Wed Jun 3 04:30:59 CEST 2015

https://hg.python.org/cpython/rev/b83fbc13ae1e
changeset: 96492:b83fbc13ae1e
parent: 96490:fd265fa89c36
parent: 96491:d11cb1218489
user: Yury Selivanov <yselivanov at sprymix.com>
date: Tue Jun 02 22:30:51 2015 -0400
summary:
 Issue 24342: No need to use PyAPI_FUNC for _PyEval_ApplyCoroutineWrapper
(Merge 3.5)
files:
 Include/ceval.h | 1 -
 Python/ceval.c | 58 +++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/Include/ceval.h b/Include/ceval.h
--- a/Include/ceval.h
+++ b/Include/ceval.h
@@ -25,7 +25,6 @@
 PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *);
 PyAPI_FUNC(void) _PyEval_SetCoroutineWrapper(PyObject *);
 PyAPI_FUNC(PyObject *) _PyEval_GetCoroutineWrapper(void);
-PyAPI_FUNC(PyObject *) _PyEval_ApplyCoroutineWrapper(PyObject *);
 #endif
 
 struct _frame; /* Avoid including frameobject.h */
diff --git a/Python/ceval.c b/Python/ceval.c
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -146,6 +146,8 @@
 static PyObject * unicode_concatenate(PyObject *, PyObject *,
 PyFrameObject *, unsigned char *);
 static PyObject * special_lookup(PyObject *, _Py_Identifier *);
+static PyObject * apply_coroutine_wrapper(PyObject *);
+
 
 #define NAME_ERROR_MSG \
 "name '%.200s' is not defined"
@@ -3935,7 +3937,7 @@
 return NULL;
 
 if (co->co_flags & (CO_COROUTINE | CO_ITERABLE_COROUTINE))
- return _PyEval_ApplyCoroutineWrapper(gen);
+ return apply_coroutine_wrapper(gen);
 
 return gen;
 }
@@ -4402,33 +4404,6 @@
 }
 
 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 *
 PyEval_GetBuiltins(void)
 {
 PyFrameObject *current_frame = PyEval_GetFrame();
@@ -5257,6 +5232,33 @@
 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
 
 static PyObject *
-- 
Repository URL: https://hg.python.org/cpython
