summaryrefslogtreecommitdiff
path: root/Lib/asyncio/queues.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-07-07 13:46:09 +0300
committerSerhiy Storchaka <storchaka@gmail.com>2014-07-07 13:46:09 +0300
commit3bc13cc8b0b85f989b8da9c5718fc5319ad06248 (patch)
tree52fc5995a7cc1ccafce61ef403b7dea1a4ff342d /Lib/asyncio/queues.py
parent667abc7d42e87b87338981276d0eac9895d4abf4 (diff)
parente50dafcd636ba32db890600164698bb070d40d97 (diff)
downloadcpython-git-3bc13cc8b0b85f989b8da9c5718fc5319ad06248.tar.gz
Merge heads
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 57afb053ee..41551a9022 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()