[pypy-svn] r45888 - pypy/branch/pypy-more-rtti-inprogress/rpython

[arigo at codespeak.net]

Author: arigo
Date: Mon Aug 20 21:24:50 2007
New Revision: 45888

Modified:
   pypy/branch/pypy-more-rtti-inprogress/rpython/typesystem.py
Log:
Oups.


Modified: pypy/branch/pypy-more-rtti-inprogress/rpython/typesystem.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/rpython/typesystem.py	(original)
+++ pypy/branch/pypy-more-rtti-inprogress/rpython/typesystem.py	Mon Aug 20 21:24:50 2007
@@ -56,13 +56,13 @@
         typ, constr = self.callable_trait
         
         FT = typ(llinputs, lloutput)
+        name = graph.name
         if hasattr(graph, 'func') and callable(graph.func):
             # the Python function object can have _llfnobjattrs_, specifying
             # attributes that are forced upon the functionptr().  The idea
             # for not passing these extra attributes as arguments to
             # getcallable() itself is that multiple calls to getcallable()
             # for the same graph should return equal functionptr() objects.
-            name = graph.name
             if hasattr(graph.func, '_llfnobjattrs_'):
                 fnobjattrs = graph.func._llfnobjattrs_.copy()
                 # can specify a '_name', but use graph.name by default
@@ -72,7 +72,7 @@
             return constr(FT, name, graph = graph, _callable = graph.func,
                           **fnobjattrs)
         else:
-            return constr(FT, name, graph = graph, **fnobjattrs)
+            return constr(FT, name, graph = graph)
 
     def getexternalcallable(self, ll_args, ll_result, name, **kwds):
         typ, constr = self.callable_trait