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

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:36:08 2009
New Revision: 66054

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

    ------------------------------------------------------------------------
    r65525 | pedronis | 2009-06-01 08:22:12 +0200 (Mon, 01 Jun 2009) | 5 lines
    
    reverting 65522, it broke a couple tests in applevel and lib-python tests
    
    not completely clear why, in general our error code is not that well tested by our own tests
    
    
    ------------------------------------------------------------------------
    r65522 | benjamin | 2009-06-01 02:00:54 +0200 (Mon, 01 Jun 2009) | 1 line
    
    normalize raise statements
    ------------------------------------------------------------------------
    r64323 | benjamin | 2009-04-18 04:44:10 +0200 (Sat, 18 Apr 2009) | 1 line
    
    remove from __future__ import generators
    ------------------------------------------------------------------------
    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/bookkeeper.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/annotation/bookkeeper.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/annotation/bookkeeper.py	(original)
+++ pypy/branch/pyjitpl5/pypy/annotation/bookkeeper.py.merge.tmp	Tue Jun 30 16:36:08 2009
@@ -1,8 +1,6 @@
 """
 The Bookkeeper class.
 """
-
-from __future__ import generators
 import sys, types, inspect, weakref
 
 from pypy.objspace.flow.model import Constant
@@ -562,16 +560,6 @@
             access_sets = map[attrname] = UnionFind(description.ClassAttrFamily)
         return access_sets
     
-    def getexternaldesc(self, class_):
-        try:
-            return self.external_class_cache[class_]
-        except KeyError:
-            from  pypy.rpython.ootypesystem import bltregistry
-            next = bltregistry.ExternalInstanceDesc(class_)
-            self.external_class_cache[class_] = next
-            next.setup()
-            return next
-
     def pbc_getattr(self, pbc, s_attr):
         assert s_attr.is_constant()
         attr = s_attr.const