[pypy-svn] r77106 - pypy/branch/better-map-instances/pypy/objspace/std

[cfbolz at codespeak.net]

Author: cfbolz
Date: Thu Sep 16 11:04:49 2010
New Revision: 77106

Modified:
   pypy/branch/better-map-instances/pypy/objspace/std/mapdict.py
Log:
fix translation

Modified: pypy/branch/better-map-instances/pypy/objspace/std/mapdict.py
==============================================================================
--- pypy/branch/better-map-instances/pypy/objspace/std/mapdict.py	(original)
+++ pypy/branch/better-map-instances/pypy/objspace/std/mapdict.py	Thu Sep 16 11:04:49 2010
@@ -403,7 +403,7 @@
 _subclass_cache = {}
 
 def _make_subclass_size_n(supercls, n):
-    if supercls._init_empty.im_func is not BaseMapdictObject._init_empty.im_func:
+    if not hasattr(supercls, "_init_empty"):
         return supercls
     from pypy.rlib import unroll, rerased
     rangen = unroll.unrolling_iterable(range(n))
@@ -585,6 +585,7 @@
 INVALID_CACHE_ENTRY = CacheEntry()
 INVALID_CACHE_ENTRY.map = objectmodel.instantiate(AbstractAttribute)
                              # different from any real map ^^^
+INVALID_CACHE_ENTRY.map.w_cls = None
 
 def init_mapdict_cache(pycode):
     num_entries = len(pycode.co_names_w)