From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 27 Apr 2010 13:15:18 +0000 (+0000)
Subject: Merged revisions 80534 via svnmerge from
X-Git-Tag: v3.2a1~989
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05830aa4ff84c9e51b64352945f82a9991a7bb73;p=python

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 a5af557513..5e659c24ea 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -679,6 +679,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: