[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #28088: Merge from 3.5

Mon Nov 7 15:21:39 EST 2016

https://hg.python.org/cpython/rev/f2858945c058
changeset: 104947:f2858945c058
branch: 3.6
parent: 104943:b26c8104e54f
parent: 104946:f4e86b1b051e
user: Berker Peksag <berker.peksag at gmail.com>
date: Mon Nov 07 23:36:50 2016 +0300
summary:
 Issue #28088: Merge from 3.5
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
