diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2016-03-02 16:31:06 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2016-03-02 16:31:06 (GMT) |
| commit | d2dc15b26b03c03df664641fce544efa05588945 (patch) | |
| tree | 1c30c4931ee089b9c8049224e20e3422136556cf /Objects | |
| parent | 5604446b3b0b127755aa93f13c49830eba43285d (diff) | |
| parent | c724bae51cd0580cd493f319f3b14c2e1a28f3b6 (diff) | |
| download | cpython-d2dc15b26b03c03df664641fce544efa05588945.zip cpython-d2dc15b26b03c03df664641fce544efa05588945.tar.gz cpython-d2dc15b26b03c03df664641fce544efa05588945.tar.bz2 | |
Merge 3.5 (issue #25888)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/genobject.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Objects/genobject.c b/Objects/genobject.c index 72d44c1..fdb3c03 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -267,8 +267,8 @@ gen_close_iter(PyObject *yf) return 0; } -static PyObject * -gen_yf(PyGenObject *gen) +PyObject * +_PyGen_yf(PyGenObject *gen) { PyObject *yf = NULL; PyFrameObject *f = gen->gi_frame; @@ -290,7 +290,7 @@ static PyObject * gen_close(PyGenObject *gen, PyObject *args) { PyObject *retval; - PyObject *yf = gen_yf(gen); + PyObject *yf = _PyGen_yf(gen); int err = 0; if (yf) { @@ -330,7 +330,7 @@ gen_throw(PyGenObject *gen, PyObject *args) PyObject *typ; PyObject *tb = NULL; PyObject *val = NULL; - PyObject *yf = gen_yf(gen); + PyObject *yf = _PyGen_yf(gen); _Py_IDENTIFIER(throw); if (!PyArg_UnpackTuple(args, "throw", 1, 3, &typ, &val, &tb)) @@ -556,7 +556,7 @@ gen_set_qualname(PyGenObject *op, PyObject *value) static PyObject * gen_getyieldfrom(PyGenObject *gen) { - PyObject *yf = gen_yf(gen); + PyObject *yf = _PyGen_yf(gen); if (yf == NULL) Py_RETURN_NONE; return yf; @@ -791,7 +791,7 @@ coro_await(PyCoroObject *coro) static PyObject * coro_get_cr_await(PyCoroObject *coro) { - PyObject *yf = gen_yf((PyGenObject *) coro); + PyObject *yf = _PyGen_yf((PyGenObject *) coro); if (yf == NULL) Py_RETURN_NONE; return yf; |