commit a170fa162dc03f0a014373349e548954fff2e567
author Christian Heimes <christian@python.org> Fri Sep 15 20:27:30 2017 +0200
committer GitHub <noreply@github.com> Fri Sep 15 20:27:30 2017 +0200
tree ed08062f8462d8b9e98e38b7832e39a85881b4e3
parent 4df60f18c64ba2835e68bf3eed08d8002a00f4ac

bpo-31346: Use PROTOCOL_TLS_CLIENT/SERVER (#3058)

Replaces PROTOCOL_TLSv* and PROTOCOL_SSLv23 with PROTOCOL_TLS_CLIENT and
PROTOCOL_TLS_SERVER.

Signed-off-by: Christian Heimes <christian@python.org>

Lib/ftplib.py

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index a02e595..05840d4 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -719,7 +719,7 @@
         '221 Goodbye.'
         >>>
         '''
-        ssl_version = ssl.PROTOCOL_SSLv23
+        ssl_version = ssl.PROTOCOL_TLS_CLIENT
 
         def __init__(self, host='', user='', passwd='', acct='', keyfile=None,
                      certfile=None, context=None,
@@ -753,7 +753,7 @@
             '''Set up secure control connection by using TLS/SSL.'''
             if isinstance(self.sock, ssl.SSLSocket):
                 raise ValueError("Already using TLS")
-            if self.ssl_version >= ssl.PROTOCOL_SSLv23:
+            if self.ssl_version >= ssl.PROTOCOL_TLS:
                 resp = self.voidcmd('AUTH TLS')
             else:
                 resp = self.voidcmd('AUTH SSL')