socket.error can really happen here, and fix a possible NameError
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 7c13db4..7c32c1b 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -684,6 +684,9 @@
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:
@@ -902,7 +905,7 @@
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(