[PATCH 3 of 3 ssl-followups] sslutil: drop defunct ssl version constants
Augie Fackler
raf at durin42.com
Wed Jan 14 14:53:27 CST 2015
# HG changeset patch
# User Augie Fackler <augie at google.com>
# Date 1421268381 18000
# Wed Jan 14 15:46:21 2015 -0500
# Node ID ae22305431c15e568d22eb03941d5269c5944226
# Parent dc0d263e6931670d64e4df89bacd53fdaca2fed1
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,
More information about the Mercurial-devel
mailing list