From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 24 May 2010 21:20:20 +0000 (+0000)
Subject: Document the context attribute of SSL sockets
X-Git-Tag: v3.2a1~704
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec883dba86b2e4109db0db20b9658251c918fc78;p=python

Document the context attribute of SSL sockets
---

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 302cb00405..bc55262d91 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -407,6 +407,16 @@ SSL Sockets
    other side of the connection, rather than the original socket.
 
 
+.. attribute:: SSLSocket.context
+
+   The :class:`SSLContext` object this SSL socket is tied to.  If the SSL
+   socket was created using the top-level :func:`wrap_socket` function
+   (rather than :meth:`SSLContext.wrap_socket`), this is a custom context
+   object created for this SSL socket.
+
+   .. versionadded:: 3.2
+
+
 SSL Contexts
 ------------