diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-07-05 15:29:41 +0200 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-07-05 15:29:41 +0200 |
commit | a9acbe82e7822e555b669139fdd8a7cb7667492c (patch) | |
tree | 6d0d3962f744ab352e231cc2aba1874531f947bb /Lib/asyncio/tasks.py | |
parent | 5021cb553c2c6bf7219882c36b9f6b2bdee5bd24 (diff) | |
download | cpython-git-a9acbe82e7822e555b669139fdd8a7cb7667492c.tar.gz |
Closes #21886, #21447: Fix a race condition in asyncio when setting the result
of a Future with call_soon(). Add an helper, a private method, to set the
result only if the future was not cancelled.
Diffstat (limited to 'Lib/asyncio/tasks.py')
-rw-r--r-- | Lib/asyncio/tasks.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index dd191e770b..8c7217b702 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -487,7 +487,8 @@ def as_completed(fs, *, loop=None, timeout=None): def sleep(delay, result=None, *, loop=None): """Coroutine that completes after a given time (in seconds).""" future = futures.Future(loop=loop) - h = future._loop.call_later(delay, future.set_result, result) + h = future._loop.call_later(delay, + future._set_result_unless_cancelled, result) try: return (yield from future) finally: |