mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-31 07:04:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix name collision issues

Browse source
This commit is contained in:
Benjamin Peterson 2008-12-31 04:08:55 +00:00
parent 43ea6d9acc
commit 941db4d91f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/ssl.py
View file

@ -74,7 +74,7 @@ from _ssl import \
SSL_ERROR_EOF, \ SSL_ERROR_EOF, \
SSL_ERROR_INVALID_ERROR_CODE 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 from socket import getnameinfo as _getnameinfo
import base64 # for DER-to-PEM translation import base64 # for DER-to-PEM translation
@ -103,7 +103,7 @@ class SSLSocket (socket):
# see if it's connected # see if it's connected
try: try:
socket.getpeername(self) socket.getpeername(self)
except socket.error: except socket_error:
# no, no connection yet # no, no connection yet
self._sslobj = None self._sslobj = None
else: else:
@ -441,7 +441,7 @@ def sslwrap_simple (sock, keyfile=None, certfile=None):
PROTOCOL_SSLv23, None) PROTOCOL_SSLv23, None)
try: try:
sock.getpeername() sock.getpeername()
except socket.error: except socket_error:
# no, no connection yet # no, no connection yet
pass pass
else: else: