diff options
| author | Georg Brandl <georg@python.org> | 2014-10-31 08:29:48 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-31 08:29:48 (GMT) |
| commit | fe98180bced16be7d62b762cc85d400f929d0885 (patch) | |
| tree | fd297a860cf6c2ab66b71742ea11398a4debc701 /Doc/tutorial | |
| parent | db3f318681811b34051573a66dc627a75131f772 (diff) | |
| parent | f0d2ed73ac6fff027dd5f309a3979e26beca7be9 (diff) | |
| download | cpython-fe98180bced16be7d62b762cc85d400f929d0885.zip cpython-fe98180bced16be7d62b762cc85d400f929d0885.tar.gz cpython-fe98180bced16be7d62b762cc85d400f929d0885.tar.bz2 | |
merge with 3.4
Diffstat (limited to 'Doc/tutorial')
| -rw-r--r-- | Doc/tutorial/classes.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst index e318c09..7e014ef 100644 --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -869,7 +869,7 @@ Generators :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 @@ easy to create:: 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. |