diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 13:15:18 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 13:15:18 (GMT) |
| commit | 05830aa4ff84c9e51b64352945f82a9991a7bb73 (patch) | |
| tree | 8f2c0b52f699718bb5e2bdc8a4e056f2a65ab6d2 | |
| parent | 18c913e2b1ca9f7c92fa7ae22e260237f241a8b7 (diff) | |
| download | cpython-05830aa4ff84c9e51b64352945f82a9991a7bb73.zip cpython-05830aa4ff84c9e51b64352945f82a9991a7bb73.tar.gz cpython-05830aa4ff84c9e51b64352945f82a9991a7bb73.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
........
| -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 a5af557..5e659c2 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: |