From: Cheryl Sabella <cheryl.sabella@gmail.com>
Date: Thu, 28 Feb 2019 18:11:35 +0000 (-0500)
Subject: [3.7] Add versionadded directives to ssl.minimum_version and ssl.maxi… (GH-12101)
X-Git-Tag: v3.7.3rc1~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dc322f8a5deecb931e66dceb0cc0a826887c661;p=thirdparty%2FPython%2Fcpython.git

[3.7] Add versionadded directives to ssl.minimum_version and ssl.maxi… (GH-12101)



…mum_version (GH-11894).

(cherry picked from commit ae2ea33d5da34a777e77d489b700ff45d753934f)

Co-authored-by: Zhiming Wang <i@zhimingwang.org>
---

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 0835e9ae04e6..fba9d5a63dd0 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1328,12 +1328,12 @@ SSL sockets also have the following additional methods and attributes:
    If any precondition isn't met (e.g. not TLS 1.3, PHA not enabled), an
    :exc:`SSLError` is raised.
 
-   .. versionadded:: 3.7.1
-
    .. note::
       Only available with OpenSSL 1.1.1 and TLS 1.3 enabled. Without TLS 1.3
       support, the method raises :exc:`NotImplementedError`.
 
+   .. versionadded:: 3.7.1
+
 .. method:: SSLSocket.version()
 
    Return the actual SSL protocol version negotiated by the connection
@@ -1922,6 +1922,8 @@ to speed up repeated connections from the same clients.
      This attribute is not available unless the ssl module is compiled
      with OpenSSL 1.1.0g or newer.
 
+   .. versionadded:: 3.7
+
 .. attribute:: SSLContext.minimum_version
 
    Like :attr:`SSLContext.maximum_version` except it is the lowest
@@ -1932,6 +1934,8 @@ to speed up repeated connections from the same clients.
      This attribute is not available unless the ssl module is compiled
      with OpenSSL 1.1.0g or newer.
 
+   .. versionadded:: 3.7
+
 .. attribute:: SSLContext.options
 
    An integer representing the set of SSL options enabled on this context.
@@ -1965,12 +1969,12 @@ to speed up repeated connections from the same clients.
    :meth:`SSLSocket.verify_client_post_handshake` is called and some I/O is
    performed.
 
-   .. versionadded:: 3.7.1
-
    .. note::
       Only available with OpenSSL 1.1.1 and TLS 1.3 enabled. Without TLS 1.3
       support, the property value is None and can't be modified
 
+   .. versionadded:: 3.7.1
+
 .. attribute:: SSLContext.protocol
 
    The protocol version chosen when constructing the context.  This attribute
@@ -1982,11 +1986,11 @@ to speed up repeated connections from the same clients.
    subject common name in the absence of a subject alternative name
    extension (default: true).
 
-   .. versionadded:: 3.7
-
    .. note::
       Only writeable with OpenSSL 1.1.0 or higher.
 
+   .. versionadded:: 3.7
+
 .. attribute:: SSLContext.verify_flags
 
    The flags for certificate verification operations. You can set flags like