diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-11-15 15:12:49 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-11-15 15:12:49 (GMT) |
| commit | ca88e9cb29fbacf0e41f3aba043a5873803e3d77 (patch) | |
| tree | 5b2490c218de7a274af13bd4c1e4e3f656d5d8bc | |
| parent | 5418ee0b9a36886064937159f9c0641ae2c4f618 (diff) | |
| parent | 04e6909845795f310aaa6905675e8c63650c3f30 (diff) | |
| download | cpython-ca88e9cb29fbacf0e41f3aba043a5873803e3d77.zip cpython-ca88e9cb29fbacf0e41f3aba043a5873803e3d77.tar.gz cpython-ca88e9cb29fbacf0e41f3aba043a5873803e3d77.tar.bz2 | |
Branch merge
| -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 0bd2c51..0553ec3 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 |