[pypy-svn] r66055 - pypy/branch/pyjitpl5/pypy/annotation

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:38:18 2009
New Revision: 66055

Added:
   pypy/branch/pyjitpl5/pypy/annotation/model.py.merge.tmp
      - copied, changed from r66039, pypy/branch/pyjitpl5/pypy/annotation/model.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/annotation/model.py
revisions 62865 to 66039:

    ------------------------------------------------------------------------
    r64279 | cfbolz | 2009-04-17 16:11:06 +0200 (Fri, 17 Apr 2009) | 2 lines
    
    (cfbolz, pedronis around): merge the kill-bltregistry branch.
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/annotation/model.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/annotation/model.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/annotation/model.py	(original)
+++ pypy/branch/pyjitpl5/pypy/annotation/model.py.merge.tmp	Tue Jun 30 16:38:18 2009
@@ -458,11 +458,6 @@
     def can_be_none(self):
         return True
 
-class SomeExternalInstance(SomeExternalObject):
-    """Stands for an object of 'external' type, but with custom access to
-    attributes as well as methods
-    """
-
 class SomeImpossibleValue(SomeObject):
     """The empty set.  Instances are placeholders for objects that
     will never show up at run-time, e.g. elements of an empty list."""
@@ -610,7 +605,6 @@
 ll_to_annotation_map = dict([(ll, ann) for ann, ll in annotation_to_ll_map if ll is not NUMBER])
 
 def lltype_to_annotation(T):
-    from pypy.rpython.ootypesystem.bltregistry import ExternalType
     try:
         s = ll_to_annotation_map.get(T)
     except TypeError: