mirror of https://github.com/python/cpython
GH-117714: implement athrow().close() and asend().close() using throw (GH-117906)
* GH-117714: replace athrow().close() and asend().close() stubs with implimentations * test athrow().close() and asend().close() raises RuntimeError * 📜🤖 Added by blurb_it. * Update Objects/genobject.c Co-authored-by: Petr Viktorin <encukou@gmail.com> --------- Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Petr Viktorin <encukou@gmail.com>
This commit is contained in:
parent
1ff626ebda
commit
e5c699280d
|
@ -571,6 +571,54 @@ class AsyncGenTest(unittest.TestCase):
|
|||
self.assertTrue(inspect.isawaitable(aclose))
|
||||
aclose.close()
|
||||
|
||||
def test_async_gen_asend_close_runtime_error(self):
|
||||
import types
|
||||
|
||||
@types.coroutine
|
||||
def _async_yield(v):
|
||||
return (yield v)
|
||||
|
||||
async def agenfn():
|
||||
try:
|
||||
await _async_yield(None)
|
||||
except GeneratorExit:
|
||||
await _async_yield(None)
|
||||
return
|
||||
yield
|
||||
|
||||
agen = agenfn()
|
||||
gen = agen.asend(None)
|
||||
gen.send(None)
|
||||
with self.assertRaisesRegex(RuntimeError, "coroutine ignored GeneratorExit"):
|
||||
gen.close()
|
||||
|
||||
def test_async_gen_athrow_close_runtime_error(self):
|
||||
import types
|
||||
|
||||
@types.coroutine
|
||||
def _async_yield(v):
|
||||
return (yield v)
|
||||
|
||||
class MyExc(Exception):
|
||||
pass
|
||||
|
||||
async def agenfn():
|
||||
try:
|
||||
yield
|
||||
except MyExc:
|
||||
try:
|
||||
await _async_yield(None)
|
||||
except GeneratorExit:
|
||||
await _async_yield(None)
|
||||
|
||||
agen = agenfn()
|
||||
with self.assertRaises(StopIteration):
|
||||
agen.asend(None).send(None)
|
||||
gen = agen.athrow(MyExc)
|
||||
gen.send(None)
|
||||
with self.assertRaisesRegex(RuntimeError, "coroutine ignored GeneratorExit"):
|
||||
gen.close()
|
||||
|
||||
|
||||
class AsyncGenAsyncioTest(unittest.TestCase):
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
update ``async_generator.athrow().close()`` and ``async_generator.asend().close()`` to close their section of the underlying async generator
|
|
@ -1846,9 +1846,26 @@ async_gen_asend_throw(PyAsyncGenASend *o, PyObject *const *args, Py_ssize_t narg
|
|||
static PyObject *
|
||||
async_gen_asend_close(PyAsyncGenASend *o, PyObject *args)
|
||||
{
|
||||
o->ags_state = AWAITABLE_STATE_CLOSED;
|
||||
PyObject *result;
|
||||
if (o->ags_state == AWAITABLE_STATE_CLOSED) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
result = async_gen_asend_throw(o, &PyExc_GeneratorExit, 1);
|
||||
if (result == NULL) {
|
||||
if (PyErr_ExceptionMatches(PyExc_StopIteration) ||
|
||||
PyErr_ExceptionMatches(PyExc_StopAsyncIteration) ||
|
||||
PyErr_ExceptionMatches(PyExc_GeneratorExit))
|
||||
{
|
||||
PyErr_Clear();
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
return result;
|
||||
} else {
|
||||
Py_DECREF(result);
|
||||
PyErr_SetString(PyExc_RuntimeError, "coroutine ignored GeneratorExit");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
async_gen_asend_finalize(PyAsyncGenASend *o)
|
||||
|
@ -2291,9 +2308,26 @@ async_gen_athrow_iternext(PyAsyncGenAThrow *o)
|
|||
static PyObject *
|
||||
async_gen_athrow_close(PyAsyncGenAThrow *o, PyObject *args)
|
||||
{
|
||||
o->agt_state = AWAITABLE_STATE_CLOSED;
|
||||
PyObject *result;
|
||||
if (o->agt_state == AWAITABLE_STATE_CLOSED) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
result = async_gen_athrow_throw(o, &PyExc_GeneratorExit, 1);
|
||||
if (result == NULL) {
|
||||
if (PyErr_ExceptionMatches(PyExc_StopIteration) ||
|
||||
PyErr_ExceptionMatches(PyExc_StopAsyncIteration) ||
|
||||
PyErr_ExceptionMatches(PyExc_GeneratorExit))
|
||||
{
|
||||
PyErr_Clear();
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
return result;
|
||||
} else {
|
||||
Py_DECREF(result);
|
||||
PyErr_SetString(PyExc_RuntimeError, "coroutine ignored GeneratorExit");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
|
|
Loading…
Reference in New Issue