summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-08-15 19:37:56 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-08-15 19:37:56 (GMT)
commiteb41c7fef89d1eefbc4be209c545c82f868f3e6e (patch)
treee920fdad35a5e5e7168594bae667be95024ce082 /Doc
parent0689ce4396dc11b593755fab715f1b04ef8d87e5 (diff)
parentdd7c55250d67de4d430a0c51dba4f3c0cd8f6ed3 (diff)
downloadcpython-eb41c7fef89d1eefbc4be209c545c82f868f3e6e.zip
cpython-eb41c7fef89d1eefbc4be209c545c82f868f3e6e.tar.gz
cpython-eb41c7fef89d1eefbc4be209c545c82f868f3e6e.tar.bz2
merge with 3.2
Diffstat (limited to 'Doc')
-rw-r--r--Doc/howto/functional.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst
index 8934d5e..f1ed07b 100644
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@ -246,9 +246,9 @@ Built-in functions such as :func:`max` and :func:`min` can take a single
iterator argument and will return the largest or smallest element. The ``"in"``
and ``"not in"`` operators also support iterators: ``X in iterator`` is true if
X is found in the stream returned by the iterator. You'll run into obvious
-problems if the iterator is infinite; ``max()``, ``min()``, and ``"not in"``
+problems if the iterator is infinite; ``max()``, ``min()``
will never return, and if the element X never appears in the stream, the
-``"in"`` operator won't return either.
+``"in"`` and ``"not in"`` operators won't return either.
Note that you can only go forward in an iterator; there's no way to get the
previous element, reset the iterator, or make a copy of it. Iterator objects