[pypy-svn] r66061 - pypy/branch/pyjitpl5/pypy/objspace/flow

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:38:51 2009
New Revision: 66061

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

    ------------------------------------------------------------------------
    r64323 | benjamin | 2009-04-18 04:44:10 +0200 (Sat, 18 Apr 2009) | 1 line
    
    remove from __future__ import generators
    ------------------------------------------------------------------------
    r64166 | arigo | 2009-04-16 15:26:16 +0200 (Thu, 16 Apr 2009) | 2 lines
    
    (cfbolz, pedronis)  Merge the branch.
    
    ------------------------------------------------------------------------
    r63865 | pedronis | 2009-04-08 18:42:06 +0200 (Wed, 08 Apr 2009) | 3 lines
    
    making a branch to check-in my WIP work, it is at least not broken with -O0 so something stranger is going on
    
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/objspace/flow/model.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/objspace/flow/model.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/objspace/flow/model.py	(original)
+++ pypy/branch/pyjitpl5/pypy/objspace/flow/model.py.merge.tmp	Tue Jun 30 16:38:51 2009
@@ -3,7 +3,6 @@
 # 
 # the below object/attribute model evolved from
 # a discussion in Berlin, 4th of october 2003
-from __future__ import generators
 import py
 from pypy.tool.uid import uid, Hashable
 from pypy.tool.descriptor import roproperty