diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 13:14:50 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 13:14:50 (GMT) |
| commit | 94d6fba9e103d618fba36018d826bd9ffe33b332 (patch) | |
| tree | a3fe1ff531d14a3095dc8a4c008bc4fd07855c56 /Lib | |
| parent | 6ab7f009ba130bc79ecc8fde2f85b1d1a2430b26 (diff) | |
| download | cpython-94d6fba9e103d618fba36018d826bd9ffe33b332.zip cpython-94d6fba9e103d618fba36018d826bd9ffe33b332.tar.gz cpython-94d6fba9e103d618fba36018d826bd9ffe33b332.tar.bz2 | |
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
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_ssl.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index e8f03d1..cc04f4c 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -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( |