diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 13:16:06 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 13:16:06 (GMT) |
| commit | 537bed68ba830651fa1e64c67d5fa991c63d88c6 (patch) | |
| tree | ca4f5397c7774c4ee42befb4236b82a3b8e961a3 /Lib/test | |
| parent | 66ffb26239a325ed07bd618b0a6448caf758f7ac (diff) | |
| download | cpython-537bed68ba830651fa1e64c67d5fa991c63d88c6.zip cpython-537bed68ba830651fa1e64c67d5fa991c63d88c6.tar.gz cpython-537bed68ba830651fa1e64c67d5fa991c63d88c6.tar.bz2 | |
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
........
................
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_ssl.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index fdde562..da30c44 100644 --- 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: |