diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2016-11-07 20:36:50 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2016-11-07 20:36:50 (GMT) |
| commit | 9c8fb94a8d280d8057282f591c20547470a000b6 (patch) | |
| tree | cbf2fe90863316e38123b4f87121ae701971ee7b /Doc | |
| parent | 78057b41591629aa676d8f128da8ec6c65ffaeb5 (diff) | |
| parent | 2ebd6feeaecbcd82ec206df9c3a2d248b30b3c40 (diff) | |
| download | cpython-9c8fb94a8d280d8057282f591c20547470a000b6.zip cpython-9c8fb94a8d280d8057282f591c20547470a000b6.tar.gz cpython-9c8fb94a8d280d8057282f591c20547470a000b6.tar.bz2 | |
Issue #28088: Merge from 3.5
Diffstat (limited to 'Doc')
| -rw-r--r-- | 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 index 873f8bb..c0342f7 100644 --- a/Doc/library/asyncio-protocol.rst +++ b/Doc/library/asyncio-protocol.rst @@ -87,18 +87,18 @@ BaseTransport - ``'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. |