# HG changeset patch # User Augie Fackler # Date 2015-01-14 20:46:21 # Node ID 948a8ca27152f9b5928d118951052e8541a84486 # Parent e1931f7cd97769eec5f8cbc7d8052bc61d77d4e5 sslutil: drop defunct ssl version constants Nobody outside sslutil should be using these constants anyway. diff --git a/mercurial/sslutil.py b/mercurial/sslutil.py --- a/mercurial/sslutil.py +++ b/mercurial/sslutil.py @@ -14,7 +14,6 @@ try: # avoid using deprecated/broken FakeSocket in python 2.6 import ssl CERT_REQUIRED = ssl.CERT_REQUIRED - PROTOCOL_TLSv1 = ssl.PROTOCOL_TLSv1 try: ssl_context = ssl.SSLContext @@ -50,7 +49,7 @@ try: ca_certs=None, serverhostname=None): sslsocket = ssl.wrap_socket(sock, keyfile, certfile, cert_reqs=cert_reqs, ca_certs=ca_certs, - ssl_version=PROTOCOL_TLSv1) + ssl_version=ssl.PROTOCOL_TLSv1) # check if wrap_socket failed silently because socket had been # closed # - see http://bugs.python.org/issue13721 @@ -60,8 +59,6 @@ try: except ImportError: CERT_REQUIRED = 2 - PROTOCOL_TLSv1 = 3 - import socket, httplib def ssl_wrap_socket(sock, keyfile, certfile, cert_reqs=CERT_REQUIRED,