traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
  ........
................
This commit is contained in:
Antoine Pitrou 2010-04-27 13:16:06 +00:00
parent 66ffb26239
commit 537bed68ba
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_ssl.py
View File

@ -643,6 +643,9 @@ else:
except ssl.SSLError as x: except ssl.SSLError as x:
if support.verbose: if support.verbose:
sys.stdout.write("\nSSLError is %s\n" % x.args[1]) 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: else:
self.fail("Use of invalid cert should have failed!") self.fail("Use of invalid cert should have failed!")
finally: finally: