diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-09-21 16:08:06 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-09-21 16:08:06 (GMT) |
| commit | d1fcca8adada7dcbd08515cde6d68b1ded3997b0 (patch) | |
| tree | 1487e13be85614688d6e3b8239d4885efc9359e0 /Doc | |
| parent | 6dae395ed55bba164fe16183decef53ea4ff32fa (diff) | |
| parent | f7dc7fb74d7c44a60f36a69437125f5ff70e32e5 (diff) | |
| download | cpython-d1fcca8adada7dcbd08515cde6d68b1ded3997b0.zip cpython-d1fcca8adada7dcbd08515cde6d68b1ded3997b0.tar.gz cpython-d1fcca8adada7dcbd08515cde6d68b1ded3997b0.tar.bz2 | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/asyncio-protocol.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst index 6cdc13d..40e8bef 100644 --- a/Doc/library/asyncio-protocol.rst +++ b/Doc/library/asyncio-protocol.rst @@ -71,6 +71,8 @@ BaseTransport - ``'peercert'``: peer certificate; result of :meth:`ssl.SSLSocket.getpeercert` - ``'sslcontext'``: :class:`ssl.SSLContext` instance + - ``'ssl_object'``: :class:`ssl.SSLObject` or :class:`ssl.SSLSocket` + instance * pipe: @@ -80,6 +82,9 @@ BaseTransport - ``'subprocess'``: :class:`subprocess.Popen` instance + .. versionchanged:: 3.4.4 + ``'ssl_object'`` info was added to SSL sockets. + ReadTransport ------------- |