[Python-checkins] cpython (merge 3.4 -> default): (Merge 3.4) Issue #21596: asyncio.wait(): mention that the sequence of futures

victor.stinner python-checkins at python.org
Tue Jun 10 11:16:29 CEST 2014


http://hg.python.org/cpython/rev/68d45a1a3ce0
changeset:   91118:68d45a1a3ce0
parent:      91116:7982a7c89d66
parent:      91117:2b3f8b6d6e5c
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Jun 10 11:16:18 2014 +0200
summary:
  (Merge 3.4) Issue #21596: asyncio.wait(): mention that the sequence of futures
must not be empty.

files:
  Doc/library/asyncio-task.rst |  2 ++
  Lib/asyncio/tasks.py         |  2 ++
  2 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -521,6 +521,8 @@
    to complete.  Coroutines will be wrapped in Tasks. Returns two sets of
    :class:`Future`: (done, pending).
 
+   The sequence *futures* must not be empty.
+
    *timeout* can be used to control the maximum number of seconds to wait before
    returning.  *timeout* can be an int or float.  If *timeout* is not specified
    or ``None``, there is no limit to the wait time.
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -387,6 +387,8 @@
 def wait(fs, *, loop=None, timeout=None, return_when=ALL_COMPLETED):
     """Wait for the Futures and coroutines given by fs to complete.
 
+    The sequence futures must not be empty.
+
     Coroutines will be wrapped in Tasks.
 
     Returns two sets of Future: (done, pending).

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list