diff Lib/ssl.py @ 44206:ce280a04f55e

Reverting revision 59394. We'll sort this out later.
author Guido van Rossum <guido@python.org>
date Thu, 06 Dec 2007 19:05:55 +0000
parents c232836ce5c9
children 19f894ae864a
line wrap: on
line diff
--- a/Lib/ssl.py	Thu Dec 06 18:39:46 2007 +0000
+++ b/Lib/ssl.py	Thu Dec 06 19:05:55 2007 +0000
@@ -148,10 +148,6 @@
         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 @@
         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 @@
                               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,