Merge 3.4 (asyncio doc)

This commit is contained in:
Victor Stinner 2015-01-09 16:00:30 +01:00
commit 863c69cfeb
2 changed files with 7 additions and 6 deletions

View File

@ -681,12 +681,12 @@ Handle
Event loop examples Event loop examples
=================== -------------------
.. _asyncio-hello-world-callback: .. _asyncio-hello-world-callback:
Hello World with call_soon() Hello World with call_soon()
---------------------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Example using the :meth:`BaseEventLoop.call_soon` method to schedule a Example using the :meth:`BaseEventLoop.call_soon` method to schedule a
callback. The callback displays ``"Hello World"`` and then stops the event callback. The callback displays ``"Hello World"`` and then stops the event
@ -716,7 +716,7 @@ loop::
.. _asyncio-date-callback: .. _asyncio-date-callback:
Display the current date with call_later() Display the current date with call_later()
------------------------------------------ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Example of callback displaying the current date every second. The callback uses Example of callback displaying the current date every second. The callback uses
the :meth:`BaseEventLoop.call_later` method to reschedule itself during 5 the :meth:`BaseEventLoop.call_later` method to reschedule itself during 5
@ -752,7 +752,7 @@ seconds, and then stops the event loop::
.. _asyncio-watch-read-event: .. _asyncio-watch-read-event:
Watch a file descriptor for read events Watch a file descriptor for read events
--------------------------------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Wait until a file descriptor received some data using the Wait until a file descriptor received some data using the
:meth:`BaseEventLoop.add_reader` method and then close the event loop:: :meth:`BaseEventLoop.add_reader` method and then close the event loop::
@ -801,7 +801,7 @@ Wait until a file descriptor received some data using the
Set signal handlers for SIGINT and SIGTERM Set signal handlers for SIGINT and SIGTERM
------------------------------------------ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Register handlers for signals :py:data:`SIGINT` and :py:data:`SIGTERM` using Register handlers for signals :py:data:`SIGINT` and :py:data:`SIGTERM` using
the :meth:`BaseEventLoop.add_signal_handler` method:: the :meth:`BaseEventLoop.add_signal_handler` method::

View File

@ -87,7 +87,8 @@ Common limits of Windows event loops:
:class:`SelectorEventLoop` specific limits: :class:`SelectorEventLoop` specific limits:
- :class:`~selectors.SelectSelector` is used but it only supports sockets - :class:`~selectors.SelectSelector` is used which only supports sockets
and is limited to 512 sockets.
- :meth:`~BaseEventLoop.add_reader` and :meth:`~BaseEventLoop.add_writer` only - :meth:`~BaseEventLoop.add_reader` and :meth:`~BaseEventLoop.add_writer` only
accept file descriptors of sockets accept file descriptors of sockets
- Pipes are not supported - Pipes are not supported