[Python-checkins] cpython: Backed out changeset c13398566409

[benjamin.peterson]

http://hg.python.org/cpython/rev/efe527e0f802
changeset:   89602:efe527e0f802
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Mar 12 13:14:19 2014 -0500
summary:
  Backed out changeset c13398566409

files:
  Lib/test/test_ssl.py |  7 +++----
  1 files changed, 3 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1351,13 +1351,12 @@
     def test_get_server_certificate(self):
         def _test_get_server_certificate(host, port, cert=None):
             with support.transient_internet(host):
-                # FIXME: force PROTOCOL_SSLv23 for workaround bug #20896
-                pem = ssl.get_server_certificate((host, port), ssl_version=ssl.PROTOCOL_SSLv23)
+                pem = ssl.get_server_certificate((host, port))
                 if not pem:
                     self.fail("No server certificate on %s:%s!" % (host, port))
 
                 try:
-                    pem = ssl.get_server_certificate((host, port), ca_certs=CERTFILE, ssl_version=ssl.PROTOCOL_SSLv23)
+                    pem = ssl.get_server_certificate((host, port), ca_certs=CERTFILE)
                 except ssl.SSLError as x:
                     #should fail
                     if support.verbose:
@@ -1365,7 +1364,7 @@
                 else:
                     self.fail("Got server certificate %s for %s:%s!" % (pem, host, port))
 
-                pem = ssl.get_server_certificate((host, port), ca_certs=cert, ssl_version=ssl.PROTOCOL_SSLv23)
+                pem = ssl.get_server_certificate((host, port), ca_certs=cert)
                 if not pem:
                     self.fail("No server certificate on %s:%s!" % (host, port))
                 if support.verbose:

-- 
Repository URL: http://hg.python.org/cpython