summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-10-24 22:28:58 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-10-24 22:28:58 (GMT)
commit37d2fe00e1de4f2baf392d6555debcb372836763 (patch)
treec3a2df1ebeece90152c0efbd625002f0ed57af5d /Doc/library
parenta933e520e8c86901630186be1eb50d4faafade0e (diff)
downloadcpython-37d2fe00e1de4f2baf392d6555debcb372836763.zip
cpython-37d2fe00e1de4f2baf392d6555debcb372836763.tar.gz
cpython-37d2fe00e1de4f2baf392d6555debcb372836763.tar.bz2
fix some py3k doc nits
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/itertools.rst10
-rw-r--r--Doc/library/multiprocessing.rst6
2 files changed, 8 insertions, 8 deletions
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
index a53988b..ec0f533 100644
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -295,10 +295,10 @@ loops that truncate the stream.
except IndexError:
pass
- If one of the iterables is potentially infinite, then the
- :func:`izip_longest` function should be wrapped with something that limits
- the number of calls (for example :func:`islice` or :func:`takewhile`). If
- not specified, *fillvalue* defaults to ``None``.
+ If one of the iterables is potentially infinite, then the :func:`zip_longest`
+ function should be wrapped with something that limits the number of calls
+ (for example :func:`islice` or :func:`takewhile`). If not specified,
+ *fillvalue* defaults to ``None``.
.. function:: permutations(iterable[, r])
@@ -590,7 +590,7 @@ which incur interpreter overhead.
def compress(data, selectors):
"compress('ABCDEF', [1,0,1,0,1,1]) --> A C E F"
- return (d for d, s in izip(data, selectors) if s)
+ return (d for d, s in zip(data, selectors) if s)
def combinations_with_replacement(iterable, r):
"combinations_with_replacement('ABC', 3) --> AA AB AC BB BC CC"
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 4ccc185..05e1a1d 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1433,8 +1433,8 @@ with the :class:`Pool` class.
.. method:: apply(func[, args[, kwds]])
- Equivalent of the :func:`apply` builtin function. It blocks till the
- result is ready.
+ Call *func* with arguments *args* and keyword arguments *kwds*. It blocks
+ till the result is ready.
.. method:: apply_async(func[, args[, kwds[, callback]]])
@@ -1465,7 +1465,7 @@ with the :class:`Pool` class.
.. method:: imap(func, iterable[, chunksize])
- An equivalent of :func:`itertools.imap`.
+ An lazier version of :meth:`map`.
The *chunksize* argument is the same as the one used by the :meth:`.map`
method. For very long iterables using a large value for *chunksize* can