[pypy-svn] r26773 - pypy/dist/pypy/interpreter

[arigo at codespeak.net]

Author: arigo
Date: Fri May  5 01:33:49 2006
New Revision: 26773

Modified:
   pypy/dist/pypy/interpreter/typedef.py
Log:
Make annotatable (probably).


Modified: pypy/dist/pypy/interpreter/typedef.py
==============================================================================
--- pypy/dist/pypy/interpreter/typedef.py	(original)
+++ pypy/dist/pypy/interpreter/typedef.py	Fri May  5 01:33:49 2006
@@ -70,6 +70,7 @@
     
     if wants_del:
         supercls = get_unique_interplevel_subclass(cls, hasdict, wants_slots, False)
+        parent_destructor = getattr(cls, '__del__', None)
         class Proto(object):
             def __del__(self):
                 try:
@@ -77,8 +78,8 @@
                 except OperationError, e:
                     e.write_unraisable(self.space, 'method __del__ of ', self)
                     e.clear(self.space)   # break up reference cycles
-                if hasattr(cls, '__del__'):
-                    cls.__del__(self)
+                if parent_destructor is not None:
+                    parent_destructor(self)
     elif wants_slots:
         supercls = get_unique_interplevel_subclass(cls, hasdict, False, False)