Skip to content

bpo-32526: Closing async generator while it is running does not raise an exception #5182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
achimnol wants to merge 2 commits into from
Closed

bpo-32526: Closing async generator while it is running does not raise an exception #5182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6e9248
bpo-32526: Add a failing test case
achimnol Jan 14, 2018
1bf2889
bpo-32526: Keep gi_running state after gen_send_ex/gen_throw calls
achimnol Jan 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions Lib/test/test_asyncgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,29 @@ async def run():
self.loop.run_until_complete(run())
self.assertEqual(DONE, 10)

def test_async_gen_asyncio_aclose_12(self):
DONE = 0

async def gen():
nonlocal DONE
await asyncio.sleep(1)
yield
DONE += 2

async def run():
nonlocal DONE
ag = gen()
asend_coro = ag.asend(None)
self.assertFalse(ag.ag_running)
fut = asend_coro.send(None)
self.assertTrue(ag.ag_running)
with self.assertRaises(ValueError):
await ag.asend(None)
DONE += 10

self.loop.run_until_complete(run())
self.assertEqual(DONE, 10)

def test_async_gen_asyncio_asend_01(self):
DONE = 0

Expand Down
5 changes: 5 additions & 0 deletions Objects/genobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1534,9 +1534,11 @@ async_gen_asend_send(PyAsyncGenASend *o, PyObject *arg)

result = gen_send_ex((PyGenObject*)o->ags_gen, arg, 0, 0);
result = async_gen_unwrap_value(o->ags_gen, result);
((PyGenObject*)o->ags_gen)->gi_running = 1;

if (result == NULL) {
o->ags_state = AWAITABLE_STATE_CLOSED;
((PyGenObject*)o->ags_gen)->gi_running = 0;
}

return result;
Expand All @@ -1562,9 +1564,11 @@ async_gen_asend_throw(PyAsyncGenASend *o, PyObject *args)

result = gen_throw((PyGenObject*)o->ags_gen, args);
result = async_gen_unwrap_value(o->ags_gen, result);
((PyGenObject*)o->ags_gen)->gi_running = 1;

if (result == NULL) {
o->ags_state = AWAITABLE_STATE_CLOSED;
((PyGenObject*)o->ags_gen)->gi_running = 0;
}

return result;
Expand All @@ -1575,6 +1579,7 @@ static PyObject *
async_gen_asend_close(PyAsyncGenASend *o, PyObject *args)
{
o->ags_state = AWAITABLE_STATE_CLOSED;
((PyGenObject*)o->ags_gen)->gi_running = 0;
Py_RETURN_NONE;
}

Expand Down