diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2017-11-07 16:22:18 (GMT) |
---|---|---|
committer | Antoine Pitrou <pitrou@free.fr> | 2017-11-07 16:22:18 (GMT) |
commit | 518c6b97868d9c665475a40567b0aa417afad607 (patch) | |
tree | 75b74673f9e4477689766c498f78765c431ccdd8 | |
parent | d9c61c2a2662761dc89e0be14ceb7ea57531c836 (diff) | |
download | cpython-518c6b97868d9c665475a40567b0aa417afad607.zip cpython-518c6b97868d9c665475a40567b0aa417afad607.tar.gz cpython-518c6b97868d9c665475a40567b0aa417afad607.tar.bz2 |
bpo-31960: Fix asyncio.Future documentation for thread (un)safety. (GH-4319) (#4320)
(cherry picked from commit 22b1128559bdeb96907da5840960691bb050d11a)
-rw-r--r-- | Doc/library/asyncio-task.rst | 2 | ||||
-rw-r--r-- | Lib/asyncio/futures.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst index 5298c11..cc8fffb 100644 --- a/Doc/library/asyncio-task.rst +++ b/Doc/library/asyncio-task.rst @@ -216,7 +216,7 @@ Future raise an exception when the future isn't done yet. - Callbacks registered with :meth:`add_done_callback` are always called - via the event loop's :meth:`~AbstractEventLoop.call_soon_threadsafe`. + via the event loop's :meth:`~AbstractEventLoop.call_soon`. - This class is not compatible with the :func:`~concurrent.futures.wait` and :func:`~concurrent.futures.as_completed` functions in the diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py index cff9590..511a14b 100644 --- a/Lib/asyncio/futures.py +++ b/Lib/asyncio/futures.py @@ -112,11 +112,13 @@ class Future: Differences: + - This class is not thread-safe. + - result() and exception() do not take a timeout argument and raise an exception when the future isn't done yet. - Callbacks registered with add_done_callback() are always called - via the event loop's call_soon_threadsafe(). + via the event loop's call_soon(). - This class is not compatible with the wait() and as_completed() methods in the concurrent.futures package. |