[Python-checkins] cpython (3.4): merge 3.3 (#20896)

Mon Mar 17 07:33:29 CET 2014

http://hg.python.org/cpython/rev/9b91c23f071c
changeset: 89793:9b91c23f071c
branch: 3.4
user: Benjamin Peterson <benjamin at python.org>
date: Wed Mar 12 18:10:57 2014 -0500
summary:
 merge 3.3 (#20896)
files:
 Lib/test/test_ssl.py | 11 ++++++++---
 1 files changed, 8 insertions(+), 3 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,12 +1351,15 @@
 def test_get_server_certificate(self):
 def _test_get_server_certificate(host, port, cert=None):
 with support.transient_internet(host):
- pem = ssl.get_server_certificate((host, port))
+ pem = ssl.get_server_certificate((host, port),
+ ssl.PROTOCOL_SSLv23)
 if not pem:
 self.fail("No server certificate on %s:%s!" % (host, port))
 
 try:
- pem = ssl.get_server_certificate((host, port), ca_certs=CERTFILE)
+ pem = ssl.get_server_certificate((host, port),
+ ssl.PROTOCOL_SSLv23,
+ ca_certs=CERTFILE)
 except ssl.SSLError as x:
 #should fail
 if support.verbose:
@@ -1364,7 +1367,9 @@
 else:
 self.fail("Got server certificate %s for %s:%s!" % (pem, host, port))
 
- pem = ssl.get_server_certificate((host, port), ca_certs=cert)
+ pem = ssl.get_server_certificate((host, port),
+ ssl.PROTOCOL_SSLv23,
+ 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
