diff options
| author | Georg Brandl <georg@python.org> | 2011-01-09 08:01:46 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-01-09 08:01:46 (GMT) |
| commit | 41d0815a65484aa72c37d09012bee38cfdecf393 (patch) | |
| tree | 13ff9b862fb6d801c051701d82c60e5b789ee421 /Doc/glossary.rst | |
| parent | 1caa644ffea384c3482e3da4cb142a2610d7f470 (diff) | |
| download | cpython-41d0815a65484aa72c37d09012bee38cfdecf393.zip cpython-41d0815a65484aa72c37d09012bee38cfdecf393.tar.gz cpython-41d0815a65484aa72c37d09012bee38cfdecf393.tar.bz2 | |
Merged revisions 87789-87790 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r87789 | georg.brandl | 2011-01-06 10:23:56 +0100 (Do, 06 Jan 2011) | 1 line
Fix various issues (mostly Python 2 relics) found by Jacques Ducasse.
........
r87790 | georg.brandl | 2011-01-06 10:25:27 +0100 (Do, 06 Jan 2011) | 1 line
Add acks where acks are due.
........
Diffstat (limited to 'Doc/glossary.rst')
| -rw-r--r-- | Doc/glossary.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 881831d..d7f2749 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -344,12 +344,12 @@ Glossary iterator An object representing a stream of data. Repeated calls to the iterator's - :meth:`__next__` (or passing it to the built-in function :func:`next`) - method return successive items in the stream. When no more data are - available a :exc:`StopIteration` exception is raised instead. At this + :meth:`__next__` method (or passing it to the built-in function + :func:`next`) return successive items in the stream. When no more data + are available a :exc:`StopIteration` exception is raised instead. At this point, the iterator object is exhausted and any further calls to its - :meth:`next` method just raise :exc:`StopIteration` again. Iterators are - required to have an :meth:`__iter__` method that returns the iterator + :meth:`__next__` method just raise :exc:`StopIteration` again. Iterators + are required to have an :meth:`__iter__` method that returns the iterator object itself so every iterator is also iterable and may be used in most places where other iterables are accepted. One notable exception is code which attempts multiple iteration passes. A container object (such as a |