[pypy-commit] pypy guard-compatible: fix translation

[cfbolz]

Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: guard-compatible
Changeset: r83433:0b869c7d00db
Date: 2016-03-30 08:43 +0100
http://bitbucket.org/pypy/pypy/changeset/0b869c7d00db/

Log:	fix translation

diff --git a/pypy/objspace/std/callmethod.py b/pypy/objspace/std/callmethod.py
--- a/pypy/objspace/std/callmethod.py
+++ b/pypy/objspace/std/callmethod.py
@@ -43,6 +43,7 @@
 
     safe = False
     w_descr = None
+    name = None
     if space.config.objspace.std.withmapdict and jit.we_are_jitted():
         # compute safeness without reading the type
         map = w_obj._get_mapdict_map_no_promote()
diff --git a/pypy/objspace/std/mapdict.py b/pypy/objspace/std/mapdict.py
--- a/pypy/objspace/std/mapdict.py
+++ b/pypy/objspace/std/mapdict.py
@@ -322,7 +322,7 @@
         # own __getattribute__
         if version is None:
             return False
-        return w_type.has_object_getattribute()
+        return self.terminator.w_cls.has_object_getattribute()
 
     def _type_lookup(self, name):
         if not self._type_safe_to_do_getattr():