diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2012-01-14 04:43:24 (GMT) |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2012-01-14 04:43:24 (GMT) |
| commit | 0ed8019c20b73f67397e53c710ddd076f0f384fd (patch) | |
| tree | d65cc4a29b3220f41a3063f525c0e08e365836e2 /Doc/reference | |
| parent | 2dfe6b00edde81d752d37d280cd47fd5aac9a433 (diff) | |
| download | cpython-0ed8019c20b73f67397e53c710ddd076f0f384fd.zip cpython-0ed8019c20b73f67397e53c710ddd076f0f384fd.tar.gz cpython-0ed8019c20b73f67397e53c710ddd076f0f384fd.tar.bz2 | |
Add versionchanged notes for PEP 380
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/expressions.rst | 5 | ||||
| -rw-r--r-- | Doc/reference/simple_stmts.rst | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst index 7da54a2..9746162 100644 --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -355,7 +355,7 @@ resumed before it is finalized (by reaching a zero reference count or by being garbage collected), the generator-iterator's :meth:`close` method will be called, allowing any pending :keyword:`finally` clauses to execute. -When ``yield from expression`` is used, it treats the supplied expression as +When ``yield from <expr>`` is used, it treats the supplied expression as a subiterator. All values produced by that subiterator are passed directly to the caller of the current generator's methods. Any values passed in with :meth:`send` and any exceptions passed in with :meth:`throw` are passed to @@ -369,6 +369,9 @@ the yield expression. It can be either set explicitly when raising :exc:`StopIteration`, or automatically when the sub-iterator is a generator (by returning a value from the sub-generator). + .. versionchanged:: 3.3 + Added ``yield from <expr>`` to delegate control flow to a subiterator + The parentheses can be omitted when the :keyword:`yield` expression is the sole expression on the right hand side of an assignment statement. diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst index d98b829..3bd0894 100644 --- a/Doc/reference/simple_stmts.rst +++ b/Doc/reference/simple_stmts.rst @@ -470,10 +470,13 @@ resumed before it is finalized (by reaching a zero reference count or by being garbage collected), the generator-iterator's :meth:`close` method will be called, allowing any pending :keyword:`finally` clauses to execute. -When ``yield from expression`` is used, it treats the supplied expression as +When ``yield from <expr>`` is used, it treats the supplied expression as a subiterator, producing values from it until the underlying iterator is exhausted. + .. versionchanged:: 3.3 + Added ``yield from <expr>`` to delegate control flow to a subiterator + For full details of :keyword:`yield` semantics, refer to the :ref:`yieldexpr` section. |