diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-10-12 10:45:38 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-10-12 10:45:38 (GMT) |
commit | 1dd7c304194572c3c5e6fd943bc0aac49a4c481c (patch) | |
tree | 8ccaddd376941640718f3795c098d5a6b515dac4 /Doc/reference/datamodel.rst | |
parent | eb818193b3445f592b26804b2030fff81625e116 (diff) | |
parent | 7fa822275bb9744440f1636345319feaf1669126 (diff) | |
download | cpython-1dd7c304194572c3c5e6fd943bc0aac49a4c481c.zip cpython-1dd7c304194572c3c5e6fd943bc0aac49a4c481c.tar.gz cpython-1dd7c304194572c3c5e6fd943bc0aac49a4c481c.tar.bz2 |
Merge __next__ method link fixes with 3.2.
Diffstat (limited to 'Doc/reference/datamodel.rst')
-rw-r--r-- | Doc/reference/datamodel.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 57a0d79..d093383 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -600,9 +600,9 @@ Callable types A function or method which uses the :keyword:`yield` statement (see section :ref:`yield`) is called a :dfn:`generator function`. Such a function, when called, always returns an iterator object which can be used to execute the - body of the function: calling the iterator's :meth:`__next__` method will - cause the function to execute until it provides a value using the - :keyword:`yield` statement. When the function executes a + body of the function: calling the iterator's :meth:`iterator__next__` + method will cause the function to execute until it provides a value + using the :keyword:`yield` statement. When the function executes a :keyword:`return` statement or falls off the end, a :exc:`StopIteration` exception is raised and the iterator will have reached the end of the set of values to be returned. |