summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/futures.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-07-05 13:29:41 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-07-05 13:29:41 (GMT)
commita9acbe82e7822e555b669139fdd8a7cb7667492c (patch)
tree6d0d3962f744ab352e231cc2aba1874531f947bb /Lib/asyncio/futures.py
parent5021cb553c2c6bf7219882c36b9f6b2bdee5bd24 (diff)
downloadcpython-a9acbe82e7822e555b669139fdd8a7cb7667492c.zip
cpython-a9acbe82e7822e555b669139fdd8a7cb7667492c.tar.gz
cpython-a9acbe82e7822e555b669139fdd8a7cb7667492c.tar.bz2
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/futures.py')
-rw-r--r--Lib/asyncio/futures.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py
index fcc90d1..022fef7 100644
--- a/Lib/asyncio/futures.py
+++ b/Lib/asyncio/futures.py
@@ -316,6 +316,12 @@ class Future:
# So-called internal methods (note: no set_running_or_notify_cancel()).
+ def _set_result_unless_cancelled(self, result):
+ """Helper setting the result only if the future was not cancelled."""
+ if self.cancelled():
+ return
+ self.set_result(result)
+
def set_result(self, result):
"""Mark the future done and set its result.