summaryrefslogtreecommitdiffstats
path: root/Doc/glossary.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-01-06 09:23:56 (GMT)
committerGeorg Brandl <georg@python.org>2011-01-06 09:23:56 (GMT)
commitb30f3303f70b2a73bd9dec068edcdf78a1c71096 (patch)
tree4b2206ed4e452ab2ffbd89459005d88b9e9db99c /Doc/glossary.rst
parent77041b23540764ef0cd4eec4f1368c740daff338 (diff)
downloadcpython-b30f3303f70b2a73bd9dec068edcdf78a1c71096.zip
cpython-b30f3303f70b2a73bd9dec068edcdf78a1c71096.tar.gz
cpython-b30f3303f70b2a73bd9dec068edcdf78a1c71096.tar.bz2
Fix various issues (mostly Python 2 relics) found by Jacques Ducasse.
Diffstat (limited to 'Doc/glossary.rst')
-rw-r--r--Doc/glossary.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index c5b97e4..32ad8e3 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -339,12 +339,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