diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-06-10 09:16:18 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-06-10 09:16:18 (GMT) |
commit | 791e5531c992323dd0605d9ccd3092876db89073 (patch) | |
tree | 8257dd37e61b0b85c275a32e24d2b8769aaa0578 | |
parent | f10642e8a9f4a1ac14aa17da8f1ddb8b7646c025 (diff) | |
parent | db74d982d43d98040e38665d843cbc8de4a082b1 (diff) | |
download | cpython-791e5531c992323dd0605d9ccd3092876db89073.zip cpython-791e5531c992323dd0605d9ccd3092876db89073.tar.gz cpython-791e5531c992323dd0605d9ccd3092876db89073.tar.bz2 |
(Merge 3.4) Issue #21596: asyncio.wait(): mention that the sequence of futures
must not be empty.
-rw-r--r-- | Doc/library/asyncio-task.rst | 2 | ||||
-rw-r--r-- | 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 index eb254a9..f1894da 100644 --- a/Doc/library/asyncio-task.rst +++ b/Doc/library/asyncio-task.rst @@ -521,6 +521,8 @@ Task functions 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 index 2aa568b..8b8fb82 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -387,6 +387,8 @@ ALL_COMPLETED = concurrent.futures.ALL_COMPLETED 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). |