Merged revisions 80536 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80536 | antoine.pitrou | 2010-04-27 15:15:18 +0200 (mar., 27 avril 2010) | 9 lines

  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
  ........
................

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index fdde562eadeadd7bf3256b756c56984e151881d1..da30c4433d5ea636f134d13347509423966a2e88 100644 (file)
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -643,6 +643,9 @@ else:
             except ssl.SSLError as x:
                 if support.verbose:
                     sys.stdout.write("\nSSLError is %s\n" % x.args[1])
+            except socket.error as 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: