[pypy-svn] r25326 - pypy/dist/pypy/annotation

[tismer at codespeak.net]

Author: tismer
Date: Tue Apr  4 21:40:26 2006
New Revision: 25326

Removed:
   pypy/dist/pypy/annotation/registry.py
Modified:
   pypy/dist/pypy/annotation/bookkeeper.py
Log:
got rid of registry.py, after all.

Modified: pypy/dist/pypy/annotation/bookkeeper.py
==============================================================================
--- pypy/dist/pypy/annotation/bookkeeper.py	(original)
+++ pypy/dist/pypy/annotation/bookkeeper.py	Tue Apr  4 21:40:26 2006
@@ -354,8 +354,6 @@
                 for ek, ev in x.iteritems():
                     result.dictdef.generalize_key(self.immutablevalue(ek))
                     result.dictdef.generalize_value(self.immutablevalue(ev))
-        elif ishashable(x) and x in DEFINED_SOMEOBJECTS: # sys by default
-            return SomeObject()
         elif ishashable(x) and x in BUILTIN_ANALYZERS:
             _module = getattr(x,"__module__","unknown")
             result = SomeBuiltin(BUILTIN_ANALYZERS[x], methodname="%s.%s" % (_module, x.__name__))
@@ -365,8 +363,6 @@
             result = SomeBuiltin(x.compute_result_annotation, methodname=x.__name__)
         elif hasattr(tp, "compute_annotation"):
             result = tp.compute_annotation()
-        elif tp in DEFINED_SOMEOBJECTS:
-            return SomeObject()
         elif tp in EXTERNAL_TYPE_ANALYZERS:
             result = SomeExternalObject(tp)
         elif isinstance(x, lltype._ptr):
@@ -701,8 +697,7 @@
 
 def delayed_imports():
     # import ordering hack
-    global BUILTIN_ANALYZERS, EXTERNAL_TYPE_ANALYZERS, DEFINED_SOMEOBJECTS
+    global BUILTIN_ANALYZERS, EXTERNAL_TYPE_ANALYZERS
     from pypy.annotation.builtin import BUILTIN_ANALYZERS
     from pypy.annotation.builtin import EXTERNAL_TYPE_ANALYZERS
-    from pypy.annotation.registry import DEFINED_SOMEOBJECTS