mirror of
https://github.com/python/cpython.git
synced 2025-08-30 13:38:43 +00:00
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:
parent
18c913e2b1
commit
05830aa4ff
1 changed files with 3 additions and 0 deletions
|
@ -679,6 +679,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:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue