From e6650f91ea2960f368f9eeec66e562b93c5b4133 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 6 Dec 2007 19:05:55 +0000 Subject: Reverting revision 59394. We'll sort this out later. --- Lib/ssl.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Lib/ssl.py') diff --git a/Lib/ssl.py b/Lib/ssl.py index a6619d643e..be13866111 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -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, -- cgit v1.2.1