Skip to content

Commit 97340d9

Browse files
committed
Can't get the test to skip so revert the change that broke it
- See PR#3050
1 parent a44f3e7 commit 97340d9

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

lib/py/src/transport/TSSLSocket.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,12 @@ class TSSLBase(object):
4747
# SSL 2.0 and 3.0 are disabled via ssl.OP_NO_SSLv2 and ssl.OP_NO_SSLv3.
4848
# For python < 2.7.9, use TLS 1.0 since TLSv1_X nor OP_NO_SSLvX is
4949
# unavailable.
50-
_default_protocol = ssl.PROTOCOL_TLS_CLIENT if _has_ssl_context else \
51-
ssl.PROTOCOL_TLSv1
50+
if sys.version_info < (3, 6):
51+
_default_protocol = ssl.PROTOCOL_SSLv23 if _has_ssl_context else \
52+
ssl.PROTOCOL_TLSv1
53+
else:
54+
_default_protocol = ssl.PROTOCOL_TLS_CLIENT if _has_ssl_context else \
55+
ssl.PROTOCOL_TLSv1
5256

5357
def _init_context(self, ssl_version):
5458
if self._has_ssl_context:

0 commit comments

Comments
 (0)