diff options
| author | Georg Brandl <georg@python.org> | 2009-10-27 14:36:50 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-10-27 14:36:50 (GMT) |
| commit | 0dfdf006a6e421cf9a8155b6d20e6e39c6387e92 (patch) | |
| tree | 201070e9a93325f635f5a800f11ea1b4c46ce17a /Doc/library/functions.rst | |
| parent | cda25a1af6e5adfafa5a61961fa6a30be53ddd5a (diff) | |
| download | cpython-0dfdf006a6e421cf9a8155b6d20e6e39c6387e92.zip cpython-0dfdf006a6e421cf9a8155b6d20e6e39c6387e92.tar.gz cpython-0dfdf006a6e421cf9a8155b6d20e6e39c6387e92.tar.bz2 | |
Merged revisions 74207 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74207 | georg.brandl | 2009-07-26 16:19:57 +0200 (So, 26 Jul 2009) | 1 line
#6577: fix (hopefully) all links to builtin instead of module/class-specific objects.
........
Diffstat (limited to 'Doc/library/functions.rst')
| -rw-r--r-- | Doc/library/functions.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index 55f23b9..704f21d 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -291,7 +291,7 @@ available. They are listed here in alphabetical order. Return an enumerate object. *sequence* must be a sequence, an :term:`iterator`, or some other object which supports iteration. The - :meth:`next` method of the iterator returned by :func:`enumerate` returns a + :meth:`!next` method of the iterator returned by :func:`enumerate` returns a tuple containing a count (from *start* which defaults to 0) and the corresponding value obtained from iterating over *iterable*. :func:`enumerate` is useful for obtaining an indexed series: ``(0, seq[0])``, @@ -600,7 +600,7 @@ available. They are listed here in alphabetical order. does not support either of those protocols, :exc:`TypeError` is raised. If the second argument, *sentinel*, is given, then *o* must be a callable object. The iterator created in this case will call *o* with no arguments for each call to - its :meth:`next` method; if the value returned is equal to *sentinel*, + its :meth:`~iterator.next` method; if the value returned is equal to *sentinel*, :exc:`StopIteration` will be raised, otherwise the value will be returned. One useful application of the second form of :func:`iter` is to read lines of @@ -704,9 +704,9 @@ available. They are listed here in alphabetical order. .. function:: next(iterator[, default]) - Retrieve the next item from the *iterator* by calling its :meth:`next` - method. If *default* is given, it is returned if the iterator is exhausted, - otherwise :exc:`StopIteration` is raised. + Retrieve the next item from the *iterator* by calling its + :meth:`~iterator.next` method. If *default* is given, it is returned if the + iterator is exhausted, otherwise :exc:`StopIteration` is raised. .. versionadded:: 2.6 |