From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 31 Dec 2008 04:08:55 +0000 (+0000)
Subject: fix name collision issues
X-Git-Tag: v2.7a1~2456
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=941db4d91f3c6eba19ddaa7310e3a79b1f9b70f7;p=thirdparty%2FPython%2Fcpython.git

fix name collision issues
---

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 03a317b7e061..1b017b1b6754 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -74,7 +74,7 @@ from _ssl import \
      SSL_ERROR_EOF, \
      SSL_ERROR_INVALID_ERROR_CODE
 
-from socket import socket, _fileobject
+from socket import socket, _fileobject, error as socket_error
 from socket import getnameinfo as _getnameinfo
 import base64        # for DER-to-PEM translation
 
@@ -103,7 +103,7 @@ class SSLSocket (socket):
         # see if it's connected
         try:
             socket.getpeername(self)
-        except socket.error:
+        except socket_error:
             # no, no connection yet
             self._sslobj = None
         else:
@@ -441,7 +441,7 @@ def sslwrap_simple (sock, keyfile=None, certfile=None):
                             PROTOCOL_SSLv23, None)
     try:
         sock.getpeername()
-    except socket.error:
+    except socket_error:
         # no, no connection yet
         pass
     else: