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

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:36:01 2009
New Revision: 66053

Added:
   pypy/branch/pyjitpl5/pypy/annotation/annrpython.py.merge.tmp
      - copied, changed from r66039, pypy/branch/pyjitpl5/pypy/annotation/annrpython.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/annotation/annrpython.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.
    
    ------------------------------------------------------------------------
    r62952 | afa | 2009-03-14 14:28:42 +0100 (Sat, 14 Mar 2009) | 3 lines
    
    Remove a unused variable,
    that can even cause an exception when reporting a degenerated value.
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/annotation/annrpython.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/annotation/annrpython.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/annotation/annrpython.py	(original)
+++ pypy/branch/pyjitpl5/pypy/annotation/annrpython.py.merge.tmp	Tue Jun 30 16:36:01 2009
@@ -1,5 +1,3 @@
-from __future__ import generators
-
 from types import FunctionType
 from pypy.tool.ansi_print import ansi_log, raise_nicer_exception
 from pypy.annotation import model as annmodel
@@ -23,7 +21,6 @@
 
     def __init__(self, translator=None, policy=None, bookkeeper=None):
         import pypy.rpython.ootypesystem.ooregistry # has side effects
-        import pypy.rpython.ootypesystem.bltregistry # has side effects
         import pypy.rpython.extfuncregistry # has side effects
         import pypy.rlib.nonconst # has side effects
 
@@ -309,7 +306,6 @@
             except AttributeError:
                 pass
 
-        graph = position_key[0]
         msgstr = format_someobject_error(self, position_key, what, s_value,
                                          called_from_graph,
                                          self.bindings.get(what, "(none)"))