summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2017-11-21 16:16:40 (GMT)
committerYury Selivanov <yury@magic.io>2017-11-21 16:16:40 (GMT)
commitd7ed48c2b8c11bb99da3661e8fe0bf5ae7f6b8d7 (patch)
tree7172e0ca4b7f6f28e262baefdeee45ff9ff70175
parent32b003aca3e9d670367bd62cbf355ee61fa6b308 (diff)
downloadcpython-d7ed48c2b8c11bb99da3661e8fe0bf5ae7f6b8d7.zip
cpython-d7ed48c2b8c11bb99da3661e8fe0bf5ae7f6b8d7.tar.gz
cpython-d7ed48c2b8c11bb99da3661e8fe0bf5ae7f6b8d7.tar.bz2
bpo-32105: add asyncio.BaseEventLoop.connect_accepted_socket versionadded to documentation. (GH-4491) (#4493)
(cherry picked from commit 431665bf1971e66c51f59abf0693f700ff7919e8)
-rw-r--r--Doc/library/asyncio-eventloop.rst3
-rw-r--r--Misc/NEWS.d/next/Documentation/2017-11-21-10-54-16.bpo-32105.91mhWm.rst1
2 files changed, 4 insertions, 0 deletions
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index 83bbb70..27c170e 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -500,6 +500,9 @@ Creating listening connections
This method is a :ref:`coroutine <coroutine>`. When completed, the
coroutine returns a ``(transport, protocol)`` pair.
+ .. versionadded:: 3.5.3
+
+
Watch file descriptors
----------------------
diff --git a/Misc/NEWS.d/next/Documentation/2017-11-21-10-54-16.bpo-32105.91mhWm.rst b/Misc/NEWS.d/next/Documentation/2017-11-21-10-54-16.bpo-32105.91mhWm.rst
new file mode 100644
index 0000000..6f95b1e
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2017-11-21-10-54-16.bpo-32105.91mhWm.rst
@@ -0,0 +1 @@
+Added asyncio.BaseEventLoop.connect_accepted_socket versionaddded marker.