mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

bpo-35125: remove inner callback on outer cancellation in asyncio shield (GH-10340)

Browse source 
When the future returned by shield is cancelled, its completion callback of the
inner future is not removed. This makes the callback list of inner inner future
grow each time a shield is created and cancelled.

This change unregisters the callback from the inner future when the outer
future is cancelled.



https://bugs.python.org/issue35125
This commit is contained in:
Romain Picard 2019-05-07 20:58:24 +02:00 • committed by Miss Islington (bot)
parent f7bda5c572
commit b35acc5b3a
3 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/asyncio/tasks.py
View file

@ -818,7 +818,7 @@ def shield(arg, *, loop=None):
loop = futures._get_loop(inner)
outer = loop.create_future()
def _done_callback(inner):
def _inner_done_callback(inner):
if outer.cancelled():
if not inner.cancelled():
# Mark inner's result as retrieved.
@ -834,7 +834,13 @@ def shield(arg, *, loop=None):
else:
outer.set_result(inner.result())
inner.add_done_callback(_done_callback)
def _outer_done_callback(outer):
if not inner.done():
inner.remove_done_callback(_inner_done_callback)
inner.add_done_callback(_inner_done_callback)
outer.add_done_callback(_outer_done_callback)
return outer