merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-31 09:29:48 +01:00
commit fe98180bce
1 changed files with 2 additions and 2 deletions

View File

@ -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.