mirror of
https://github.com/python/cpython.git
synced 2025-10-07 07:31:46 +00:00
bpo-26552: Fixed case where failing asyncio.ensure_future
did not close the coroutine (#30288)
This commit is contained in:
parent
36f538c809
commit
24cc6411ad
3 changed files with 21 additions and 3 deletions
|
@ -621,17 +621,23 @@ def _ensure_future(coro_or_future, *, loop=None):
|
|||
raise ValueError('The future belongs to a different loop than '
|
||||
'the one specified as the loop argument')
|
||||
return coro_or_future
|
||||
|
||||
called_wrap_awaitable = False
|
||||
if not coroutines.iscoroutine(coro_or_future):
|
||||
if inspect.isawaitable(coro_or_future):
|
||||
coro_or_future = _wrap_awaitable(coro_or_future)
|
||||
called_wrap_awaitable = True
|
||||
else:
|
||||
raise TypeError('An asyncio.Future, a coroutine or an awaitable '
|
||||
'is required')
|
||||
|
||||
if loop is None:
|
||||
loop = events._get_event_loop(stacklevel=4)
|
||||
return loop.create_task(coro_or_future)
|
||||
try:
|
||||
return loop.create_task(coro_or_future)
|
||||
except RuntimeError:
|
||||
if not called_wrap_awaitable:
|
||||
coro_or_future.close()
|
||||
raise
|
||||
|
||||
|
||||
@types.coroutine
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue