[pypy-svn] r7310 - pypy/trunk/src/pypy/annotation

[arigo at codespeak.net]

Author: arigo
Date: Wed Nov 17 11:12:16 2004
New Revision: 7310

Modified:
   pypy/trunk/src/pypy/annotation/builtin.py
   pypy/trunk/src/pypy/annotation/unaryop.py
Log:
Fiddling around...


Modified: pypy/trunk/src/pypy/annotation/builtin.py
==============================================================================
--- pypy/trunk/src/pypy/annotation/builtin.py	(original)
+++ pypy/trunk/src/pypy/annotation/builtin.py	Wed Nov 17 11:12:16 2004
@@ -49,7 +49,7 @@
     if moreargs:
         raise Exception, 'type() called with more than one argument'
     #...
-    return SomeObject(knowntype=type)
+    return SomeObject()
 
 
 # collect all functions

Modified: pypy/trunk/src/pypy/annotation/unaryop.py
==============================================================================
--- pypy/trunk/src/pypy/annotation/unaryop.py	(original)
+++ pypy/trunk/src/pypy/annotation/unaryop.py	Wed Nov 17 11:12:16 2004
@@ -186,18 +186,14 @@
 
     def getattr(pbc, s_attr):
         assert s_attr.is_constant()
+        attr = s_attr.const
         bookkeeper = getbookkeeper()
         actuals = []
-        attr = s_attr.const
         for c in pbc.prebuiltinstances:
             bookkeeper.attrs_read_from_constants.setdefault(c, {})[attr] = True
             if hasattr(c.value, attr):
-                actuals.append(immutablevalue(getattr(c.value, s_attr.const)))
+                actuals.append(immutablevalue(getattr(c.value, attr)))
         return unionof(*actuals)
 
     def setattr(pbc, s_attr, s_value):
         raise Exception, "oops!"
-
-    def simple_call(pbc, *args):
-        s_meth = pbc.getattr(immutablevalue("__call__"))
-        return s_meth.simple_call(*args)