[pypy-svn] r57634 - pypy/branch/typeobject-init/pypy/objspace/std

[arigo at codespeak.net]

Author: arigo
Date: Tue Aug 26 18:39:56 2008
New Revision: 57634

Modified:
   pypy/branch/typeobject-init/pypy/objspace/std/typeobject.py
Log:
Fix test_shadowtracking.


Modified: pypy/branch/typeobject-init/pypy/objspace/std/typeobject.py
==============================================================================
--- pypy/branch/typeobject-init/pypy/objspace/std/typeobject.py	(original)
+++ pypy/branch/typeobject-init/pypy/objspace/std/typeobject.py	Tue Aug 26 18:39:56 2008
@@ -70,11 +70,13 @@
 
         if overridetypedef is not None:
             setup_builtin_type(w_self)
+            custom_metaclass = False
         else:
             setup_user_defined_type(w_self)
+            custom_metaclass = not space.is_w(space.type(w_self), space.w_type)
 
         if space.config.objspace.std.withtypeversion:
-            if w_self.instancetypedef.hasdict:
+            if w_self.instancetypedef.hasdict or custom_metaclass:
                 w_self.version_tag = None
             else:
                 w_self.version_tag = VersionTag()