Merge 3.2

This commit is contained in:
Éric Araujo 2011-11-15 16:13:16 +01:00
commit 5f7f6150c3
1 changed files with 2 additions and 2 deletions

View File

@ -234,8 +234,8 @@ Code for creating and managing concurrency is being collected in a new top-level
namespace, *concurrent*. Its first member is a *futures* package which provides namespace, *concurrent*. Its first member is a *futures* package which provides
a uniform high-level interface for managing threads and processes. a uniform high-level interface for managing threads and processes.
The design for :mod:`concurrent.futures` was inspired by The design for :mod:`concurrent.futures` was inspired by the
*java.util.concurrent.package*. In that model, a running call and its result *java.util.concurrent* package. In that model, a running call and its result
are represented by a :class:`~concurrent.futures.Future` object that abstracts are represented by a :class:`~concurrent.futures.Future` object that abstracts
features common to threads, processes, and remote procedure calls. That object features common to threads, processes, and remote procedure calls. That object
supports status checks (running or done), timeouts, cancellations, adding supports status checks (running or done), timeouts, cancellations, adding