Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 15:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 80509 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80509 | antoine.pitrou | 2010-04-26 19:29:05 +0200 (lun., 26 avril 2010) | 10 lines

  Merged revisions 80507 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80507 | antoine.pitrou | 2010-04-26 19:23:33 +0200 (lun., 26 avril 2010) | 4 lines

    When calling getpeername() in SSLSocket.__init__, only silence exceptions
    caused by the "socket not connected" condition.
  ........
................
This commit is contained in:
Antoine Pitrou 2010-04-26 17:32:49 +00:00
parent d329d1a8cf
commit 365171d8f6
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/ssl.py
View file

@ -81,6 +81,7 @@
from socket import socket, AF_INET, SOCK_STREAM
import base64 # for DER-to-PEM translation
import traceback
import errno
class SSLSocket(socket):
@ -115,7 +116,9 @@ def __init__(self, sock=None, keyfile=None, certfile=None,
# see if it's connected
try:
socket.getpeername(self)
except socket_error:
except socket_error as e:
if e.errno != errno.ENOTCONN:
raise
# no, no connection yet
self._sslobj = None
else: