[pypy-commit] pypy no-class-specialize: read stuff directly from the actual class dict in get_param()

rlamy noreply at buildbot.pypy.org
Fri Oct 16 11:47:12 EDT 2015


Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: no-class-specialize
Changeset: r80283:36d40d759dfc
Date: 2015-10-16 16:47 +0100
http://bitbucket.org/pypy/pypy/changeset/36d40d759dfc/

Log:	read stuff directly from the actual class dict in get_param()

diff --git a/rpython/annotator/classdesc.py b/rpython/annotator/classdesc.py
--- a/rpython/annotator/classdesc.py
+++ b/rpython/annotator/classdesc.py
@@ -689,16 +689,11 @@
             return cdesc
 
     def get_param(self, name, default=None, inherit=True):
+        cls = self.pyobj
         if inherit:
-            try:
-                return self.read_attribute(name).value
-            except AttributeError:
-                return default
+            return getattr(cls, name, default)
         else:
-            try:
-                return self.classdict[name].value
-            except KeyError:
-                return default
+            return cls.__dict__.get(name, default)
 
     def read_attribute(self, name, default=NODEFAULT):
         cdesc = self.lookup(name)


More information about the pypy-commit mailing list