summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-01-09 15:00:30 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-01-09 15:00:30 (GMT)
commit863c69cfebcafbf97ba401e0f3cd5cb077e0e8f2 (patch)
tree09a3ebb19a1363578c2a7d2ba7f28d4893c96e49 /Doc/library
parent4f5366e65a4d773fb5dda3329bd7b7c5425718fb (diff)
parent7eb10311be26e8f353530ed79476d4c859243401 (diff)
downloadcpython-863c69cfebcafbf97ba401e0f3cd5cb077e0e8f2.zip
cpython-863c69cfebcafbf97ba401e0f3cd5cb077e0e8f2.tar.gz
cpython-863c69cfebcafbf97ba401e0f3cd5cb077e0e8f2.tar.bz2
Merge 3.4 (asyncio doc)
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/asyncio-eventloop.rst10
-rw-r--r--Doc/library/asyncio-eventloops.rst3
2 files changed, 7 insertions, 6 deletions
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index 748d4e3..12e60c4 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -681,12 +681,12 @@ Handle
Event loop examples
-===================
+-------------------
.. _asyncio-hello-world-callback:
Hello World with call_soon()
-----------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Example using the :meth:`BaseEventLoop.call_soon` method to schedule a
callback. The callback displays ``"Hello World"`` and then stops the event
@@ -716,7 +716,7 @@ loop::
.. _asyncio-date-callback:
Display the current date with call_later()
-------------------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Example of callback displaying the current date every second. The callback uses
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:
Watch a file descriptor for read events
----------------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Wait until a file descriptor received some data using the
: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
-------------------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Register handlers for signals :py:data:`SIGINT` and :py:data:`SIGTERM` using
the :meth:`BaseEventLoop.add_signal_handler` method::
diff --git a/Doc/library/asyncio-eventloops.rst b/Doc/library/asyncio-eventloops.rst
index e891ed1..afb8b9f 100644
--- a/Doc/library/asyncio-eventloops.rst
+++ b/Doc/library/asyncio-eventloops.rst
@@ -87,7 +87,8 @@ Common limits of Windows event loops:
: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
accept file descriptors of sockets
- Pipes are not supported