Reverting revision 59394. We'll sort this out later.

This commit is contained in:
Guido van Rossum 2007-12-06 19:05:55 +00:00
parent 03b5c9ae75
commit e6650f91ea
2 changed files with 16 additions and 64 deletions

View file

@ -148,10 +148,6 @@ class SSLSocket(socket):
self.do_handshake_on_connect = do_handshake_on_connect
self.suppress_ragged_eofs = suppress_ragged_eofs
# See Modules/_ssl.c:PySSL_dealloc()
# def __del__(self):
# self._real_close()
def dup(self):
raise NotImplemented("Can't dup() %s instances" %
self.__class__.__name__)
@ -304,7 +300,6 @@ class SSLSocket(socket):
socket.shutdown(self, how)
def _real_close(self):
# real close is called by Modules/_ssl.c:PySSL_dealloc()
self._sslobj = None
# self._closed = True
if self._base:
@ -353,6 +348,10 @@ class SSLSocket(socket):
self.do_handshake_on_connect),
addr)
def __del__(self):
self._real_close()
def wrap_socket(sock, keyfile=None, certfile=None,
server_side=False, cert_reqs=CERT_NONE,
ssl_version=PROTOCOL_SSLv23, ca_certs=None,