summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-02-21 02:42:24 (GMT)
committerGitHub <noreply@github.com>2021-02-21 02:42:24 (GMT)
commit089a21f7429a3fd3cf78e3779df724757d346d19 (patch)
treece584ce7784a7705656b8687bbf56b580465c052 /Doc
parent9a12c213c6f26876c9e00a8cebef3bc9030b6b99 (diff)
downloadcpython-089a21f7429a3fd3cf78e3779df724757d346d19.zip
cpython-089a21f7429a3fd3cf78e3779df724757d346d19.tar.gz
cpython-089a21f7429a3fd3cf78e3779df724757d346d19.tar.bz2
bpo-27646: Say that 'yield from' expression can be any iterable (GH-24595)
Previously, the doc at least strongly implied that it had to be an iterator. (cherry picked from commit 2f9ef514fb24b6a95bd3272885f197752810c107) Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
Diffstat (limited to 'Doc')
-rw-r--r--Doc/reference/expressions.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
index 81dd6fc..0ac4599 100644
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -476,8 +476,8 @@ allowing any pending :keyword:`finally` clauses to execute.
.. index::
single: from; yield from expression
-When ``yield from <expr>`` is used, it treats the supplied expression as
-a subiterator. All values produced by that subiterator are passed directly
+When ``yield from <expr>`` is used, the supplied expression must be an
+iterable. The values produced by iterating that iterable are passed directly
to the caller of the current generator's methods. Any values passed in with
:meth:`~generator.send` and any exceptions passed in with
:meth:`~generator.throw` are passed to the underlying iterator if it has the