[pypy-commit] pypy py3k: cleanup destruction now that we're fully responsible for it

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r61516:bb1736dca67c
Date: 2013-02-20 16:12 -0800
http://bitbucket.org/pypy/pypy/changeset/bb1736dca67c/

Log:	cleanup destruction now that we're fully responsible for it

diff --git a/pypy/module/_socket/interp_socket.py b/pypy/module/_socket/interp_socket.py
--- a/pypy/module/_socket/interp_socket.py
+++ b/pypy/module/_socket/interp_socket.py
@@ -166,12 +166,14 @@
 
     def destructor(self):
         assert isinstance(self, W_RSocket)
-        RSocket.__del__(self)
+        if self.fd != rsocket.INVALID_SOCKET:
+            try:
+                self._dealloc_warn()
+            finally:
+                self.close_w(self.space)
 
     def _dealloc_warn(self):
         space = self.space
-        if not space:
-            return
         try:
             msg = (u"unclosed %s" %
                    space.unicode_w(space.repr(space.wrap(self))))