diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-11-15 15:13:16 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-11-15 15:13:16 (GMT) |
| commit | 5f7f6150c38f1ed33d83c6597ae275ab5f5b99c5 (patch) | |
| tree | 48ac4b8a7db8b7274ce94657d792b59a27f58f24 | |
| parent | 3f2ba3bd864d0ca606ff1b96989d7d62905292dd (diff) | |
| parent | ca88e9cb29fbacf0e41f3aba043a5873803e3d77 (diff) | |
| download | cpython-5f7f6150c38f1ed33d83c6597ae275ab5f5b99c5.zip cpython-5f7f6150c38f1ed33d83c6597ae275ab5f5b99c5.tar.gz cpython-5f7f6150c38f1ed33d83c6597ae275ab5f5b99c5.tar.bz2 | |
Merge 3.2
| -rw-r--r-- | Doc/whatsnew/3.2.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst index 48751e8..99827ff 100644 --- a/Doc/whatsnew/3.2.rst +++ b/Doc/whatsnew/3.2.rst @@ -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 a uniform high-level interface for managing threads and processes. -The design for :mod:`concurrent.futures` was inspired by -*java.util.concurrent.package*. In that model, a running call and its result +The design for :mod:`concurrent.futures` was inspired by the +*java.util.concurrent* package. In that model, a running call and its result are represented by a :class:`~concurrent.futures.Future` object that abstracts features common to threads, processes, and remote procedure calls. That object supports status checks (running or done), timeouts, cancellations, adding |