[Python-checkins] cpython (merge 3.6 -> default): Issue #28088: Merge from 3.6
berker.peksag
python-checkins at python.org
Mon Nov 7 15:21:39 EST 2016
https://hg.python.org/cpython/rev/62b7614970bd
changeset: 104948:62b7614970bd
parent: 104944:b8233c779ff7
parent: 104947:f2858945c058
user: Berker Peksag <berker.peksag at gmail.com>
date: Mon Nov 07 23:37:12 2016 +0300
summary:
Issue #28088: Merge from 3.6
files:
Doc/library/asyncio-protocol.rst | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst
--- a/Doc/library/asyncio-protocol.rst
+++ b/Doc/library/asyncio-protocol.rst
@@ -87,18 +87,18 @@
- ``'subprocess'``: :class:`subprocess.Popen` instance
- .. method:: set_protocol(self, protocol)
+ .. method:: set_protocol(protocol)
Set a new protocol. Switching protocol should only be done when both
protocols are documented to support the switch.
- .. versionadded:: 3.6.0
+ .. versionadded:: 3.5.3
- .. method:: get_protocol(self)
+ .. method:: get_protocol
Return the current protocol.
- .. versionadded:: 3.6.0
+ .. versionadded:: 3.5.3
.. versionchanged:: 3.5.1
``'ssl_object'`` info was added to SSL sockets.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list