[pypy-svn] r25750 - pypy/dist/pypy/translator/c

[pedronis at codespeak.net]

Author: pedronis
Date: Thu Apr 13 00:31:33 2006
New Revision: 25750

Modified:
   pypy/dist/pypy/translator/c/pyobj.py
Log:
check for old-style class or subclass of object (not another builtin type)



Modified: pypy/dist/pypy/translator/c/pyobj.py
==============================================================================
--- pypy/dist/pypy/translator/c/pyobj.py	(original)
+++ pypy/dist/pypy/translator/c/pyobj.py	Thu Apr 13 00:31:33 2006
@@ -3,7 +3,7 @@
 from types import FunctionType, CodeType, InstanceType, ClassType
 
 from pypy.objspace.flow.model import Variable, Constant
-from pypy.translator.gensupp import builtin_base
+from pypy.translator.gensupp import builtin_base, builtin_type_base
 from pypy.translator.c.support import log
 from pypy.translator.c.wrapper import gen_wrapper
 
@@ -335,7 +335,7 @@
         return name
 
     def nameof_classobj(self, cls):
-        if builtin_base(cls) is object:
+        if isinstance(cls, ClassType) or builtin_type_base(cls) is object:
             clsdef = self.translator.annotator.bookkeeper.getuniqueclassdef(cls)
             if self.translator.rtyper.needs_wrapper(clsdef):
                 return self.wrap_exported_class(cls)