cpython (merge 3.4 -> default): merge with 3.4
https://hg.python.org/cpython/rev/0e8411d268a0 changeset: 93304:0e8411d268a0 parent: 93302:2b7277903930 parent: 93303:253b97bf87d4 user: Georg Brandl <georg@python.org> date: Fri Oct 31 09:29:48 2014 +0100 summary: merge with 3.4 files: Doc/tutorial/classes.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -869,7 +869,7 @@ :term:`Generator`\s are a simple and powerful tool for creating iterators. They are written like regular functions but use the :keyword:`yield` statement whenever they want to return data. Each time :func:`next` is called on it, the -generator resumes where it left-off (it remembers all the data values and which +generator resumes where it left off (it remembers all the data values and which statement was last executed). An example shows that generators can be trivially easy to create:: @@ -887,7 +887,7 @@ o g -Anything that can be done with generators can also be done with class based +Anything that can be done with generators can also be done with class-based iterators as described in the previous section. What makes generators so compact is that the :meth:`__iter__` and :meth:`~generator.__next__` methods are created automatically. -- Repository URL: https://hg.python.org/cpython
participants (1)
-
georg.brandl