Author: Carl Friedrich Bolz <cfb...@gmx.de>
Branch: guard-compatible
Changeset: r85136:de092081d81f
Date: 2016-06-13 16:42 +0200
http://bitbucket.org/pypy/pypy/changeset/de092081d81f/
Log: fix merge
diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py
--- a/pypy/objspace/std/typeobject.py
+++ b/pypy/objspace/std/typeobject.py
@@ -241,7 +241,7 @@
self._version_tag = version_tag
self.terminator.mutated_w_cls_version(version_tag)
- def getattribute_if_not_from_object(w_self):
+ def getattribute_if_not_from_object(self):
""" this method returns the applevel __getattribute__ if that is not
the one from object, in which case it returns None """
from pypy.objspace.descroperation import object_getattribute
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
