diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2014-07-24 02:59:17 -0400 |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2014-07-24 02:59:17 -0400 |
| commit | 3b1bcedd57f0f305ddb37a67c27b30f6d662a9d7 (patch) | |
| tree | 3c143d8906edd2337bd2fccf45b41a63d9da44f0 | |
| parent | 2e57dcc87e82cd4161b38e3fa109a6473818b7fa (diff) | |
| parent | 9ff41803af8206e7e76b5feb389faf7e8767afd9 (diff) | |
| download | cpython-git-3b1bcedd57f0f305ddb37a67c27b30f6d662a9d7.tar.gz | |
Merge with 3.4
| -rw-r--r-- | Doc/library/asyncio-eventloop.rst | 4 | ||||
| -rw-r--r-- | Doc/library/asyncio.rst | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst index 6fe5aa1b20..46af81fa63 100644 --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -58,13 +58,11 @@ Run an event loop .. method:: BaseEventLoop.close() - Close the event loop. The loop should not be running. + Close the event loop. The loop must not be running. This clears the queues and shuts down the executor, but does not wait for the executor to finish. - The event loop must not be running. - This is idempotent and irreversible. No other methods should be called after this one. diff --git a/Doc/library/asyncio.rst b/Doc/library/asyncio.rst index 9857c932fd..90a152bf9b 100644 --- a/Doc/library/asyncio.rst +++ b/Doc/library/asyncio.rst @@ -39,7 +39,7 @@ Here is a more detailed list of the package contents: you absolutely, positively have to use a library that makes blocking I/O calls. -Table of content: +Table of contents: .. toctree:: :maxdepth: 3 @@ -55,6 +55,6 @@ Table of content: .. seealso:: - The :mod:`asyncio` module was designed in the :PEP:`3156`. For a + The :mod:`asyncio` module was designed in :PEP:`3156`. For a motivational primer on transports and protocols, see :PEP:`3153`. |