diff options
author | Martin Panter <vadmium+py@gmail.com> | 2015-11-02 04:04:57 (GMT) |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2015-11-02 04:04:57 (GMT) |
commit | 2eb819f7a82c7eb61f2d253894d9973f0ec21df2 (patch) | |
tree | c881e371e6ae948cbd725afd91fa8f5b0c6c940f /Doc/library/concurrent.futures.rst | |
parent | 56275dc1e2a2f354620189efd751fa90af2118e1 (diff) | |
parent | 7462b64911f1e2df2de2285ddbf8b156b5cdc418 (diff) | |
download | cpython-2eb819f7a82c7eb61f2d253894d9973f0ec21df2.zip cpython-2eb819f7a82c7eb61f2d253894d9973f0ec21df2.tar.gz cpython-2eb819f7a82c7eb61f2d253894d9973f0ec21df2.tar.bz2 |
Issue #25523: Merge "a" to "an" fixes from 3.4 into 3.5
Diffstat (limited to 'Doc/library/concurrent.futures.rst')
-rw-r--r-- | Doc/library/concurrent.futures.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst index 9ac6171..8bb70a5 100644 --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -90,7 +90,7 @@ Executor Objects ThreadPoolExecutor ------------------ -:class:`ThreadPoolExecutor` is a :class:`Executor` subclass that uses a pool of +:class:`ThreadPoolExecutor` is an :class:`Executor` subclass that uses a pool of threads to execute calls asynchronously. Deadlocks can occur when the callable associated with a :class:`Future` waits on @@ -304,7 +304,7 @@ The :class:`Future` class encapsulates the asynchronous execution of a callable. Added callables are called in the order that they were added and are always called in a thread belonging to the process that added them. If - the callable raises a :exc:`Exception` subclass, it will be logged and + the callable raises an :exc:`Exception` subclass, it will be logged and ignored. If the callable raises a :exc:`BaseException` subclass, the behavior is undefined. |