summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-12-22 21:10:10 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-12-22 21:10:10 (GMT)
commitfa45c2e7a69fdd632e37892ad6952d118f295567 (patch)
treece7219e2bc927a8c522ac5b7380bf349bd6c83fd
parent1bdef7aefa2e32837b011bd37cc975e6aff5fa75 (diff)
parent952ec98abb28eeda92e13c9c142f5288aecc5a21 (diff)
downloadcpython-fa45c2e7a69fdd632e37892ad6952d118f295567.zip
cpython-fa45c2e7a69fdd632e37892ad6952d118f295567.tar.gz
cpython-fa45c2e7a69fdd632e37892ad6952d118f295567.tar.bz2
Merge 3.4 (asyncio)
-rw-r--r--Lib/asyncio/queues.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py
index 41551a9..8f6c257 100644
--- a/Lib/asyncio/queues.py
+++ b/Lib/asyncio/queues.py
@@ -111,8 +111,10 @@ class Queue:
def put(self, item):
"""Put an item into the queue.
- If you yield from put(), wait until a free slot is available
- before adding item.
+ Put an item into the queue. If the queue is full, wait until a free
+ slot is available before adding item.
+
+ This method is a coroutine.
"""
self._consume_done_getters()
if self._getters:
@@ -161,7 +163,9 @@ class Queue:
def get(self):
"""Remove and return an item from the queue.
- If you yield from get(), wait until a item is available.
+ If queue is empty, wait until an item is available.
+
+ This method is a coroutine.
"""
self._consume_done_putters()
if self._putters: