[pypy-svn] r64323 - in pypy/trunk/pypy: annotation interpreter/pyparser interpreter/test module/__builtin__ objspace/flow objspace/std rpython tool/pytest translator translator/c translator/tool

[benjamin at codespeak.net]

Author: benjamin
Date: Sat Apr 18 04:44:10 2009
New Revision: 64323

Modified:
   pypy/trunk/pypy/annotation/annrpython.py
   pypy/trunk/pypy/annotation/bookkeeper.py
   pypy/trunk/pypy/annotation/classdef.py
   pypy/trunk/pypy/interpreter/pyparser/pytokenize.py
   pypy/trunk/pypy/interpreter/test/test_generator.py
   pypy/trunk/pypy/module/__builtin__/app_functional.py
   pypy/trunk/pypy/objspace/flow/model.py
   pypy/trunk/pypy/objspace/std/listtype.py
   pypy/trunk/pypy/rpython/rtyper.py
   pypy/trunk/pypy/tool/pytest/appsupport.py
   pypy/trunk/pypy/translator/c/external.py
   pypy/trunk/pypy/translator/c/funcgen.py
   pypy/trunk/pypy/translator/c/node.py
   pypy/trunk/pypy/translator/geninterplevel.py
   pypy/trunk/pypy/translator/gensupp.py
   pypy/trunk/pypy/translator/tool/make_dot.py
   pypy/trunk/pypy/translator/transform.py
Log:
remove from __future__ import generators

Modified: pypy/trunk/pypy/annotation/annrpython.py
==============================================================================
--- pypy/trunk/pypy/annotation/annrpython.py	(original)
+++ pypy/trunk/pypy/annotation/annrpython.py	Sat Apr 18 04:44:10 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

Modified: pypy/trunk/pypy/annotation/bookkeeper.py
==============================================================================
--- pypy/trunk/pypy/annotation/bookkeeper.py	(original)
+++ pypy/trunk/pypy/annotation/bookkeeper.py	Sat Apr 18 04:44:10 2009
@@ -1,8 +1,6 @@
 """
 The Bookkeeper class.
 """
-
-from __future__ import generators
 import sys, types, inspect, weakref
 
 from pypy.objspace.flow.model import Constant

Modified: pypy/trunk/pypy/annotation/classdef.py
==============================================================================
--- pypy/trunk/pypy/annotation/classdef.py	(original)
+++ pypy/trunk/pypy/annotation/classdef.py	Sat Apr 18 04:44:10 2009
@@ -1,8 +1,6 @@
 """
 Type inference for user-defined classes.
 """
-
-from __future__ import generators
 from pypy.annotation.model import SomePBC, s_ImpossibleValue, unionof
 from pypy.annotation.model import SomeInteger, isdegenerated, SomeTuple,\
      SomeString

Modified: pypy/trunk/pypy/interpreter/pyparser/pytokenize.py
==============================================================================
--- pypy/trunk/pypy/interpreter/pyparser/pytokenize.py	(original)
+++ pypy/trunk/pypy/interpreter/pyparser/pytokenize.py	Sat Apr 18 04:44:10 2009
@@ -17,7 +17,6 @@
 """
 # ______________________________________________________________________
 
-from __future__ import generators
 from pypy.interpreter.pyparser import automata
 
 __all__ = [ "tokenize" ]

Modified: pypy/trunk/pypy/interpreter/test/test_generator.py
==============================================================================
--- pypy/trunk/pypy/interpreter/test/test_generator.py	(original)
+++ pypy/trunk/pypy/interpreter/test/test_generator.py	Sat Apr 18 04:44:10 2009
@@ -1,5 +1,3 @@
-from __future__ import generators
-
 class AppTestGenerator:
 
     def test_generator(self):

Modified: pypy/trunk/pypy/module/__builtin__/app_functional.py
==============================================================================
--- pypy/trunk/pypy/module/__builtin__/app_functional.py	(original)
+++ pypy/trunk/pypy/module/__builtin__/app_functional.py	Sat Apr 18 04:44:10 2009
@@ -2,8 +2,6 @@
 Plain Python definition of the builtin functions oriented towards
 functional programming.
 """
-from __future__ import generators
-
 
 
 def sum(sequence, total=0):

Modified: pypy/trunk/pypy/objspace/flow/model.py
==============================================================================
--- pypy/trunk/pypy/objspace/flow/model.py	(original)
+++ pypy/trunk/pypy/objspace/flow/model.py	Sat Apr 18 04:44:10 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

Modified: pypy/trunk/pypy/objspace/std/listtype.py
==============================================================================
--- pypy/trunk/pypy/objspace/std/listtype.py	(original)
+++ pypy/trunk/pypy/objspace/std/listtype.py	Sat Apr 18 04:44:10 2009
@@ -1,4 +1,3 @@
-from __future__ import generators
 from pypy.interpreter import gateway
 from pypy.interpreter.error import OperationError
 from pypy.objspace.std.stdtypedef import *

Modified: pypy/trunk/pypy/rpython/rtyper.py
==============================================================================
--- pypy/trunk/pypy/rpython/rtyper.py	(original)
+++ pypy/trunk/pypy/rpython/rtyper.py	Sat Apr 18 04:44:10 2009
@@ -11,7 +11,6 @@
 computation part.
 """
 
-from __future__ import generators
 import os
 import py
 from pypy.tool.pairtype import pair

Modified: pypy/trunk/pypy/tool/pytest/appsupport.py
==============================================================================
--- pypy/trunk/pypy/tool/pytest/appsupport.py	(original)
+++ pypy/trunk/pypy/tool/pytest/appsupport.py	Sat Apr 18 04:44:10 2009
@@ -1,4 +1,3 @@
-from __future__ import generators 
 import autopath
 import py
 from py.__.magic import exprinfo

Modified: pypy/trunk/pypy/translator/c/external.py
==============================================================================
--- pypy/trunk/pypy/translator/c/external.py	(original)
+++ pypy/trunk/pypy/translator/c/external.py	Sat Apr 18 04:44:10 2009
@@ -1,4 +1,3 @@
-from __future__ import generators
 from pypy.rpython.lltypesystem.lltype import typeOf, Void
 from pypy.translator.c.support import USESLOTS # set to False if necessary while refactoring
 from pypy.translator.c.support import cdecl, somelettersfrom

Modified: pypy/trunk/pypy/translator/c/funcgen.py
==============================================================================
--- pypy/trunk/pypy/translator/c/funcgen.py	(original)
+++ pypy/trunk/pypy/translator/c/funcgen.py	Sat Apr 18 04:44:10 2009
@@ -1,4 +1,3 @@
-from __future__ import generators
 from pypy.translator.c.support import USESLOTS # set to False if necessary while refactoring
 from pypy.translator.c.support import cdecl
 from pypy.translator.c.support import llvalue_from_constant, gen_assignments

Modified: pypy/trunk/pypy/translator/c/node.py
==============================================================================
--- pypy/trunk/pypy/translator/c/node.py	(original)
+++ pypy/trunk/pypy/translator/c/node.py	Sat Apr 18 04:44:10 2009
@@ -1,4 +1,3 @@
-from __future__ import generators
 from pypy.rpython.lltypesystem.lltype import \
      Struct, Array, FixedSizeArray, FuncType, PyObjectType, typeOf, \
      GcStruct, GcArray, RttiStruct, ContainerType, \

Modified: pypy/trunk/pypy/translator/geninterplevel.py
==============================================================================
--- pypy/trunk/pypy/translator/geninterplevel.py	(original)
+++ pypy/trunk/pypy/translator/geninterplevel.py	Sat Apr 18 04:44:10 2009
@@ -43,7 +43,6 @@
 pieces in pypy svn.
 """
 
-from __future__ import generators
 import autopath, os, sys, types
 import inspect
 import cPickle as pickle, __builtin__

Modified: pypy/trunk/pypy/translator/gensupp.py
==============================================================================
--- pypy/trunk/pypy/translator/gensupp.py	(original)
+++ pypy/trunk/pypy/translator/gensupp.py	Sat Apr 18 04:44:10 2009
@@ -3,8 +3,6 @@
 Another name could be genEric, but well...
 """
 
-from __future__ import generators
-
 import sys
 
 from pypy.objspace.flow.model import Block

Modified: pypy/trunk/pypy/translator/tool/make_dot.py
==============================================================================
--- pypy/trunk/pypy/translator/tool/make_dot.py	(original)
+++ pypy/trunk/pypy/translator/tool/make_dot.py	Sat Apr 18 04:44:10 2009
@@ -1,8 +1,3 @@
-from __future__ import generators
- 
-"""
-"""
-
 import autopath, os
 import inspect, linecache
 from pypy.objspace.flow.model import *

Modified: pypy/trunk/pypy/translator/transform.py
==============================================================================
--- pypy/trunk/pypy/translator/transform.py	(original)
+++ pypy/trunk/pypy/translator/transform.py	Sat Apr 18 04:44:10 2009
@@ -5,8 +5,6 @@
 completed.
 """
 
-from __future__ import generators
-
 import types
 from pypy.objspace.flow.model import SpaceOperation
 from pypy.objspace.flow.model import Variable, Constant, Link