mirrors/cpython
mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 17:47:13 +01:00
Code Issues Releases Activity

GH-117714: implement athrow().close() and asend().close() using throw (GH-117906)

Browse Source 
* 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:
Thomas Grainger 2024-05-06 18:13:15 +01:00 committed by GitHub
parent 1ff626ebda
commit e5c699280d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 87 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Lib/test/test_asyncgen.py
View File

@ -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):

1
Misc/NEWS.d/next/Core and Builtins/2024-05-01-07-06-48.gh-issue-117714.Ip_dm5.rst Normal file
View File

@ -0,0 +1 @@
update ``async_generator.athrow().close()`` and ``async_generator.asend().close()`` to close their section of the underlying async generator

38
Objects/genobject.c
View File

@ -1846,8 +1846,25 @@ 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
@ -2291,8 +2308,25 @@ 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;
}
}