From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 26 Apr 2010 17:32:49 +0000 (+0000)
Subject: Merged revisions 80509 via svnmerge from
X-Git-Tag: v3.1.3rc1~861
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=365171d8f605a950bc62398f73c4fc923be6e7cd;p=python

Merged revisions 80509 via svnmerge from
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.
  ........
................
---

diff --git a/Lib/ssl.py b/Lib/ssl.py
index caee2e589f..59aff879b4 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -81,6 +81,7 @@ from socket import dup as _dup
 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 @@ class SSLSocket(socket):
         # 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: