summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/queues.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-01-09 00:42:52 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-01-09 00:42:52 (GMT)
commit3531d9044dbfd15b3bf5ec1abe5b9744fce37464 (patch)
tree4b4846bc3c351148f8bb8e6355b18710e6660e92 /Lib/asyncio/queues.py
parent399c59d7bd5caeacfd98338d69400f83f15987db (diff)
downloadcpython-3531d9044dbfd15b3bf5ec1abe5b9744fce37464.zip
cpython-3531d9044dbfd15b3bf5ec1abe5b9744fce37464.tar.gz
cpython-3531d9044dbfd15b3bf5ec1abe5b9744fce37464.tar.bz2
asyncio: sync with Tulip
* Document why set_result() calls are safe * Cleanup gather(). Use public methods instead of hacks to consume the exception of a future. * sock_connect(): pass directly the fd to _sock_connect_done instead of the socket.
Diffstat (limited to 'Lib/asyncio/queues.py')
-rw-r--r--Lib/asyncio/queues.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py
index 8f6c257..dce0d53 100644
--- a/Lib/asyncio/queues.py
+++ b/Lib/asyncio/queues.py
@@ -126,6 +126,8 @@ class Queue:
# Use _put and _get instead of passing item straight to getter, in
# case a subclass has logic that must run (e.g. JoinableQueue).
self._put(item)
+
+ # getter cannot be cancelled, we just removed done getters
getter.set_result(self._get())
elif self._maxsize > 0 and self._maxsize <= self.qsize():
@@ -152,6 +154,8 @@ class Queue:
# Use _put and _get instead of passing item straight to getter, in
# case a subclass has logic that must run (e.g. JoinableQueue).
self._put(item)
+
+ # getter cannot be cancelled, we just removed done getters
getter.set_result(self._get())
elif self._maxsize > 0 and self._maxsize <= self.qsize():
@@ -200,6 +204,8 @@ class Queue:
item, putter = self._putters.popleft()
self._put(item)
# Wake putter on next tick.
+
+ # getter cannot be cancelled, we just removed done putters
putter.set_result(None)
return self._get()