Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Lib/asyncio/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -997,6 +997,9 @@ def _outer_done_callback(outer):
# Keep only one callback to log on cancel
inner.remove_done_callback(_log_on_exception)
inner.add_done_callback(_log_on_exception)
if cur_task is not None:
inner.remove_done_callback(_clear_awaited_by_callback)
futures.future_discard_from_awaited_by(inner, cur_task)

if cur_task is not None:
inner.add_done_callback(_clear_awaited_by_callback)
Expand Down
17 changes: 17 additions & 0 deletions Lib/test/test_asyncio/test_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -2109,6 +2109,8 @@ def test_shield_cancel_outer(self):
test_utils.run_briefly(self.loop)
self.assertTrue(outer.cancelled())
self.assertEqual(0, 0 if outer._callbacks is None else len(outer._callbacks))
self.assertEqual(0, 0 if inner._asyncio_awaited_by is None else len(inner._asyncio_awaited_by))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.assertEqual(0, 0 if inner._asyncio_awaited_by is None else len(inner._asyncio_awaited_by))
self.assertFalse(inner._asyncio_awaited_by)

self.assertTrue({f for f, _ctx in inner._callbacks or []} <= {asyncio.tasks._log_on_exception})

def test_shield_cancel_outer_result(self):
mock_handler = mock.Mock()
Expand All @@ -2134,6 +2136,21 @@ def test_shield_cancel_outer_exception(self):
test_utils.run_briefly(self.loop)
mock_handler.assert_called_once()

def test_shield_cancel_outer_in_task(self):
inner = self.new_future(self.loop)

async def coro():
outer = asyncio.shield(inner)
self.assertNotEqual(0, len(inner._callbacks))
outer.cancel()
await asyncio.sleep(0)
self.assertTrue(outer.cancelled())

task = self.new_task(self.loop, coro())
self.loop.run_until_complete(task)
self.assertEqual(0, 0 if inner._asyncio_awaited_by is None else len(inner._asyncio_awaited_by))
self.assertTrue({f for f, _ctx in inner._callbacks or []} <= {asyncio.tasks._log_on_exception})

def test_shield_duplicate_log_once(self):
mock_handler = mock.Mock()
self.loop.set_exception_handler(mock_handler)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :func:`asyncio.shield` leaking the calling task via the await-graph and
callbacks when called on a future that never resolves.
Loading