[pypy-commit] pypy gc-del: Fix _ssl.

arigo noreply at buildbot.pypy.org
Fri Apr 26 18:14:33 CEST 2013


Author: Armin Rigo <arigo at tunes.org>
Branch: gc-del
Changeset: r63654:30c2cfc0af97
Date: 2013-04-26 17:40 +0200
http://bitbucket.org/pypy/pypy/changeset/30c2cfc0af97/

Log:	Fix _ssl.

diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py
+++ b/pypy/module/_ssl/interp_ssl.py
@@ -132,6 +132,7 @@
         self._issuer = lltype.malloc(rffi.CCHARP.TO, X509_NAME_MAXLEN, flavor='raw')
         self._issuer[0] = '\0'
         self.shutdown_seen_zero = False
+        self.register_finalizer()
 
     def server(self):
         return self.space.wrap(rffi.charp2str(self._server))
@@ -139,12 +140,7 @@
     def issuer(self):
         return self.space.wrap(rffi.charp2str(self._issuer))
 
-    def __del__(self):
-        self.enqueue_for_destruction(self.space, SSLObject.destructor,
-                                     '__del__() method of ')
-
-    def destructor(self):
-        assert isinstance(self, SSLObject)
+    def invoke_finalizer(self):
         if self.peer_cert:
             libssl_X509_free(self.peer_cert)
         if self.ssl:


More information about the pypy-commit mailing list