Author: Carl Friedrich Bolz <[email protected]>
Branch: guard-compatible
Changeset: r83435:7aa196510609
Date: 2016-03-30 10:53 +0200
http://bitbucket.org/pypy/pypy/changeset/7aa196510609/
Log: Backed out changeset 7fef35dc1817
can't use the has_object_getattribute, because it has arbitrary
effects
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,9 @@
# own __getattribute__
if version is None:
return False
- return self.terminator.w_cls.has_object_getattribute()
+ w_type = self.terminator.w_cls
+ w_descr = self._type_lookup_pure('__getattribute__')
+ return w_descr is object_getattribute(self.space)
def _type_lookup(self, name):
if not self._type_safe_to_do_getattr():
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
