benjamin.peterson
2008-10-24 22:28:58 UTC
Author: benjamin.peterson
Date: Sat Oct 25 00:28:58 2008
New Revision: 67011
Log:
fix some py3k doc nits
Modified:
python/branches/py3k/Doc/library/itertools.rst
python/branches/py3k/Doc/library/multiprocessing.rst
Modified: python/branches/py3k/Doc/library/itertools.rst
==============================================================================
--- python/branches/py3k/Doc/library/itertools.rst (original)
+++ python/branches/py3k/Doc/library/itertools.rst Sat Oct 25 00:28:58 2008
@@ -295,10 +295,10 @@
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 @@
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"
Modified: python/branches/py3k/Doc/library/multiprocessing.rst
==============================================================================
--- python/branches/py3k/Doc/library/multiprocessing.rst (original)
+++ python/branches/py3k/Doc/library/multiprocessing.rst Sat Oct 25 00:28:58 2008
@@ -1433,8 +1433,8 @@
.. 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 @@
.. 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
Date: Sat Oct 25 00:28:58 2008
New Revision: 67011
Log:
fix some py3k doc nits
Modified:
python/branches/py3k/Doc/library/itertools.rst
python/branches/py3k/Doc/library/multiprocessing.rst
Modified: python/branches/py3k/Doc/library/itertools.rst
==============================================================================
--- python/branches/py3k/Doc/library/itertools.rst (original)
+++ python/branches/py3k/Doc/library/itertools.rst Sat Oct 25 00:28:58 2008
@@ -295,10 +295,10 @@
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 @@
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"
Modified: python/branches/py3k/Doc/library/multiprocessing.rst
==============================================================================
--- python/branches/py3k/Doc/library/multiprocessing.rst (original)
+++ python/branches/py3k/Doc/library/multiprocessing.rst Sat Oct 25 00:28:58 2008
@@ -1433,8 +1433,8 @@
.. 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 @@
.. 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