Skip to content

Commit

Permalink
bpo-42230: Improve asyncio documentation regarding accepting sets vs …
Browse files Browse the repository at this point in the history
…iterables (GH-23073)

People call wait() and as_completed() with various non-set iterables,
a list should be the most common but there are others as well[1].

Considering typeshed also documents wait()[2] and as_completed()[3]
as accepting arbitrary iterables I think it's a good idea to document
the status quo better.

[1] aio-libs/aiokafka#672
[2] https://github.com/python/typeshed/blob/620989bac572f30349b95590ebe81a73ce0fe862/stdlib/3/asyncio/tasks.pyiGH-L161
[3] https://github.com/python/typeshed/blob/620989bac572f30349b95590ebe81a73ce0fe862/stdlib/3/asyncio/tasks.pyiGH-L40
(cherry picked from commit 3d86d09)

Co-authored-by: Jakub Stasiak <jakub@stasiak.at>
  • Loading branch information
miss-islington and jstasiak committed Nov 2, 2020
1 parent 27c72ba commit ff852aa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Doc/library/asyncio-task.rst
Expand Up @@ -504,10 +504,10 @@ Waiting Primitives
return_when=ALL_COMPLETED)

Run :ref:`awaitable objects <asyncio-awaitables>` in the *aws*
set concurrently and block until the condition specified
iterable concurrently and block until the condition specified
by *return_when*.

The *aws* set must not be empty.
The *aws* iterable must not be empty.

Returns two sets of Tasks/Futures: ``(done, pending)``.

Expand Down Expand Up @@ -593,9 +593,9 @@ Waiting Primitives
.. function:: as_completed(aws, \*, loop=None, timeout=None)

Run :ref:`awaitable objects <asyncio-awaitables>` in the *aws*
set concurrently. Return an iterator of coroutines.
iterable concurrently. Return an iterator of coroutines.
Each coroutine returned can be awaited to get the earliest next
result from the set of the remaining awaitables.
result from the iterable of the remaining awaitables.

Raises :exc:`asyncio.TimeoutError` if the timeout occurs before
all Futures are done.
Expand Down
4 changes: 2 additions & 2 deletions Lib/asyncio/tasks.py
Expand Up @@ -373,7 +373,7 @@ def create_task(coro, *, name=None):
async 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.
The fs iterable must not be empty.
Coroutines will be wrapped in Tasks.
Expand Down Expand Up @@ -573,7 +573,7 @@ def as_completed(fs, *, loop=None, timeout=None):
Note: The futures 'f' are not necessarily members of fs.
"""
if futures.isfuture(fs) or coroutines.iscoroutine(fs):
raise TypeError(f"expect a list of futures, not {type(fs).__name__}")
raise TypeError(f"expect an iterable of futures, not {type(fs).__name__}")

from .queues import Queue # Import here to avoid circular import problem.
done = Queue(loop=loop)
Expand Down

0 comments on commit ff852aa

Please sign in to comment.