commit 941db4d91f3c6eba19ddaa7310e3a79b1f9b70f7
author Benjamin Peterson <benjamin@python.org> Wed Dec 31 04:08:55 2008 +0000
committer Benjamin Peterson <benjamin@python.org> Wed Dec 31 04:08:55 2008 +0000
tree ede1c3457e45bad466e91e1996401881da4c91f5
parent 43ea6d9acc5227976ab0deeef0243cfaf5b0be71

fix name collision issues

Lib/ssl.py

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 03a317b..1b017b1 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -74,7 +74,7 @@
      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 @@
         # 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 @@
                             PROTOCOL_SSLv23, None)
     try:
         sock.getpeername()
-    except socket.error:
+    except socket_error:
         # no, no connection yet
         pass
     else: