Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-07-24 02:59:17 -04:00
commit 3b1bcedd57
2 changed files with 3 additions and 5 deletions

View File

@ -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.

View File

@ -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`.