From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 21 Feb 2018 06:02:18 +0000 (-0800)
Subject: bpo-32008: don't use PROTOCOL_TLSv1 in example (GH-5789)
X-Git-Tag: v3.7.0b2~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5d38deb045d0907e6fcf82af8d2d8f0556a8591;p=python

bpo-32008: don't use PROTOCOL_TLSv1 in example (GH-5789)


It's bad form to pin to an old version of TLS. ssl.SSLContext has the right
protocol default, so let's not pass anyway.
(cherry picked from commit e9edee0b65650c4f9db90cefc2e9a8125bad762c)

Co-authored-by: Benjamin Peterson <benjamin@python.org>
---

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index aa1075d4b0..21da4f6387 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1707,7 +1707,7 @@ to speed up repeated connections from the same clients.
 
       import socket, ssl
 
-      context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
+      context = ssl.SSLContext()
       context.verify_mode = ssl.CERT_REQUIRED
       context.check_hostname = True
       context.load_default_certs()
@@ -1952,7 +1952,7 @@ If you prefer to tune security settings yourself, you might create
 a context from scratch (but beware that you might not get the settings
 right)::
 
-   >>> context = ssl.SSLContext(ssl.PROTOCOL_TLS)
+   >>> context = ssl.SSLContext()
    >>> context.verify_mode = ssl.CERT_REQUIRED
    >>> context.check_hostname = True
    >>> context.load_verify_locations("/etc/ssl/certs/ca-bundle.crt")