summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/queues.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/queues.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/queues.py')
-rw-r--r--Lib/asyncio/queues.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py
index 57afb05..41551a9 100644
--- a/Lib/asyncio/queues.py
+++ b/Lib/asyncio/queues.py
@@ -173,7 +173,7 @@ class Queue:
# run, we need to defer the put for a tick to ensure that
# getters and putters alternate perfectly. See
# ChannelTest.test_wait.
- self._loop.call_soon(putter.set_result, None)
+ self._loop.call_soon(putter._set_result_unless_cancelled, None)
return self._get()