Merged revisions 80534 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80534 | antoine.pitrou | 2010-04-27 15:13:26 +0200 (mar., 27 avril 2010) | 3 lines socket.error can really happen here, and fix a possible NameError ........
This commit is contained in:
parent
6ab7f009ba
commit
94d6fba9e1
|
@ -647,6 +647,9 @@ else:
|
|||
except ssl.SSLError, x:
|
||||
if test_support.verbose:
|
||||
sys.stdout.write("\nSSLError is %s\n" % x[1])
|
||||
except socket.error, x:
|
||||
if test_support.verbose:
|
||||
sys.stdout.write("\nsocket.error is %s\n" % x[1])
|
||||
else:
|
||||
self.fail("Use of invalid cert should have failed!")
|
||||
finally:
|
||||
|
@ -858,7 +861,7 @@ else:
|
|||
sys.stdout.write("\n")
|
||||
try:
|
||||
tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv2, True)
|
||||
except (SSLError, socket.error), x:
|
||||
except (ssl.SSLError, socket.error), x:
|
||||
# this fails on some older versions of OpenSSL (0.9.7l, for instance)
|
||||
if test_support.verbose:
|
||||
sys.stdout.write(
|
||||
|
|
Loading…
Reference in New Issue