diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-08-26 17:14:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-26 17:14:59 (GMT) |
| commit | 1036ccb55de4abc70837cb46a72ddbb370b8fc94 (patch) | |
| tree | 307a6e80f9467c7ad18242c717c772d5e3fc809f /Lib/asyncio/tasks.py | |
| parent | d7cd1164c18dbf78380ce4c95bf46c7bb0ac0bb7 (diff) | |
| download | cpython-1036ccb55de4abc70837cb46a72ddbb370b8fc94.zip cpython-1036ccb55de4abc70837cb46a72ddbb370b8fc94.tar.gz cpython-1036ccb55de4abc70837cb46a72ddbb370b8fc94.tar.bz2 | |
bpo-32751: Wait for task cancel in asyncio.wait_for() when timeout <= 0 (GH-21895) (GH-21963)
When I was fixing bpo-32751 back in GH-7216 I missed the case when
*timeout* is zero or negative. This takes care of that.
Props to @aaliddell for noticing the inconsistency.
(cherry picked from commit c517fc712105c8e5930cb42baaebdbe37fc3e15f)
Co-authored-by: Elvis Pranskevichus <elvis@magic.io>
Diffstat (limited to 'Lib/asyncio/tasks.py')
| -rw-r--r-- | Lib/asyncio/tasks.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index c37f0e1..7ecec96 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -445,8 +445,13 @@ async def wait_for(fut, timeout, *, loop=None): if fut.done(): return fut.result() - fut.cancel() - raise exceptions.TimeoutError() + await _cancel_and_wait(fut, loop=loop) + try: + fut.result() + except exceptions.CancelledError as exc: + raise exceptions.TimeoutError() from exc + else: + raise exceptions.TimeoutError() waiter = loop.create_future() timeout_handle = loop.call_later(timeout, _release_waiter, waiter) |