[Python-checkins] r81449 - peps/trunk/pep-3148.txt

[georg.brandl]

Author: georg.brandl
Date: Sat May 22 00:00:25 2010
New Revision: 81449

Log:
Update from Brian.

Modified:
   peps/trunk/pep-3148.txt

Modified: peps/trunk/pep-3148.txt
==============================================================================
--- peps/trunk/pep-3148.txt	(original)
+++ peps/trunk/pep-3148.txt	Sat May 22 00:00:25 2010
@@ -118,14 +118,14 @@
 
 ``map(func, *iterables, timeout=None)``
 
-    Equivalent to ``map(func, *iterables)`` but executed
-    asynchronously and possibly out-of-order.  The returned iterator
-    raises a `TimeoutError` if `__next__()` is called and the result
-    isn't available after *timeout* seconds from the original call to
-    `map()`.  If *timeout* is not specified or `None` then there is no
-    limit to the wait time.  If a call raises an exception then that
-    exception will be raised when its value is retrieved from the
-    iterator.
+    Equivalent to ``map(func, *iterables)`` but func is executed 
+    asynchronously and several calls to func may be made concurrently.
+    The returned iterator raises a `TimeoutError` if `__next__()` is
+    called and the result isn't available after *timeout* seconds from
+    the original call to `map()`.  If *timeout* is not specified or
+    `None` then there is no limit to the wait time.  If a call raises
+    an exception then that exception will be raised when its value is
+    retrieved from the iterator.
 
 ``shutdown(wait=True)``
 
@@ -364,7 +364,7 @@
 
 Futures are created by concrete implementations of the Executor class
 (called ExecutorService in Java).  The reference implementation
-provides classes that use either a process a thread pool to eagerly
+provides classes that use either a process or a thread pool to eagerly
 evaluate computations.
 
 Futures have already been seen in Python as part of a popular Python