[Python-checkins] cpython (merge 3.5 -> 3.6): Merge 3.5 (issue #27392)
yury.selivanov
python-checkins at python.org
Mon Nov 7 15:36:09 EST 2016
https://hg.python.org/cpython/rev/6811df9e9797
changeset: 104950:6811df9e9797
branch: 3.6
parent: 104947:f2858945c058
parent: 104949:3e6570231c80
user: Yury Selivanov <yury at magic.io>
date: Mon Nov 07 15:35:45 2016 -0500
summary:
Merge 3.5 (issue #27392)
files:
Doc/library/asyncio-eventloop.rst | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -462,6 +462,23 @@
Availability: UNIX.
+.. coroutinemethod:: BaseEventLoop.connect_accepted_socket(protocol_factory, sock, \*, ssl=None)
+
+ Handle an accepted connection.
+
+ This is used by servers that accept connections outside of
+ asyncio but that use asyncio to handle them.
+
+ Parameters:
+
+ * *sock* is a preexisting socket object returned from an ``accept``
+ call.
+
+ * *ssl* can be set to an :class:`~ssl.SSLContext` to enable SSL over the
+ accepted connections.
+
+ This method is a :ref:`coroutine <coroutine>`. When completed, the
+ coroutine returns a ``(transport, protocol)`` pair.
Watch file descriptors
----------------------
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list