[pypy-svn] r20473 - pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem

pedronis at codespeak.net pedronis at codespeak.net
Thu Dec 1 00:32:09 CET 2005


Author: pedronis
Date: Thu Dec  1 00:32:08 2005
New Revision: 20473

Modified:
   pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem/rclass.py
Log:
oops, don't hide exceptions


Modified: pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem/rclass.py
==============================================================================
--- pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem/rclass.py	(original)
+++ pypy/branch/somepbc-refactoring/pypy/rpython/lltypesystem/rclass.py	Thu Dec  1 00:32:08 2005
@@ -401,7 +401,6 @@
                 else:
                     try:
                         attrvalue = getattr(value, name)
-                        llattrvalue = r.convert_const(attrvalue)
                     except AttributeError:
                         attrvalue = self.classdef.classdesc.read_attribute(name, None)
                         if attrvalue is None:
@@ -409,6 +408,8 @@
                                     value, name))
                             continue
                         llattrvalue = r.convert_desc_or_const(attrvalue)
+                    else:
+                        llattrvalue = r.convert_const(attrvalue)
                 setattr(result, mangled_name, llattrvalue)
         else:
             # OBJECT part



More information about the Pypy-commit mailing list