[pypy-commit] pypy translation-cleanup: Cleanup imports in pypy/objspace/flow/

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: translation-cleanup
Changeset: r57650:fbafaa97911a
Date: 2012-09-29 03:10 +0100
http://bitbucket.org/pypy/pypy/changeset/fbafaa97911a/

Log:	Cleanup imports in pypy/objspace/flow/

diff --git a/pypy/objspace/flow/flowcontext.py b/pypy/objspace/flow/flowcontext.py
--- a/pypy/objspace/flow/flowcontext.py
+++ b/pypy/objspace/flow/flowcontext.py
@@ -1,12 +1,12 @@
 import collections
-import sys
 from pypy.tool.error import source_lines
 from pypy.interpreter import pyframe
 from pypy.interpreter.nestedscope import Cell
-from pypy.interpreter.pycode import CO_OPTIMIZED, CO_NEWLOCALS
+from pypy.interpreter.pycode import CO_NEWLOCALS
 from pypy.interpreter.argument import ArgumentsForTranslation
-from pypy.interpreter.pyopcode import Return, Yield, BytecodeCorruption
-from pypy.objspace.flow.model import *
+from pypy.interpreter.pyopcode import Return, BytecodeCorruption
+from pypy.objspace.flow.model import (Constant, Variable, Block, Link,
+    UnwrapException, SpaceOperation, FunctionGraph, c_last_exception)
 from pypy.objspace.flow.framestate import (FrameState, recursively_unflatten,
         recursively_flatten)
 from pypy.objspace.flow.bytecode import HostCode
diff --git a/pypy/objspace/flow/objspace.py b/pypy/objspace/flow/objspace.py
--- a/pypy/objspace/flow/objspace.py
+++ b/pypy/objspace/flow/objspace.py
@@ -1,11 +1,11 @@
 # ______________________________________________________________________
 import __builtin__
 import sys
-import operator
 import types
 from pypy.interpreter.baseobjspace import ObjSpace
-from pypy.interpreter import pyframe, argument
-from pypy.objspace.flow.model import *
+from pypy.interpreter.argument import ArgumentsForTranslation
+from pypy.objspace.flow.model import (Constant, Variable, WrapException,
+    UnwrapException, checkgraph, SpaceOperation)
 from pypy.objspace.flow import operation
 from pypy.objspace.flow.flowcontext import (FlowSpaceFrame, fixeggblocks,
     FSException, FlowingError)
@@ -396,7 +396,7 @@
         return self.call_function(w_meth, *arg_w)
 
     def call_function(self, w_func, *args_w):
-        args = argument.ArgumentsForTranslation(self, list(args_w))
+        args = ArgumentsForTranslation(self, list(args_w))
         return self.call_args(w_func, args)
 
     def appcall(self, func, *args_w):
diff --git a/pypy/objspace/flow/operation.py b/pypy/objspace/flow/operation.py
--- a/pypy/objspace/flow/operation.py
+++ b/pypy/objspace/flow/operation.py
@@ -6,13 +6,9 @@
 import __builtin__
 import __future__
 import operator
-import types
-import sys
 from pypy.interpreter.baseobjspace import ObjSpace
-from pypy.interpreter.error import OperationError
 from pypy.tool.sourcetools import compile2
 from pypy.rlib.rarithmetic import ovfcheck
-from pypy.objspace.flow import model
 
 
 FunctionByName = {}   # dict {"operation_name": <built-in function>}
diff --git a/pypy/objspace/flow/specialcase.py b/pypy/objspace/flow/specialcase.py
--- a/pypy/objspace/flow/specialcase.py
+++ b/pypy/objspace/flow/specialcase.py
@@ -1,10 +1,7 @@
-from pypy.objspace.flow.model import Constant, UnwrapException
+from pypy.objspace.flow.model import Constant
 from pypy.objspace.flow.operation import OperationName, Arity
-from pypy.interpreter.error import OperationError
-from pypy.tool.cache import Cache
 from pypy.rlib.rarithmetic import r_uint
 from pypy.rlib.objectmodel import we_are_translated
-import py
 
 def sc_import(space, fn, args):
     args_w, kwds_w = args.unpack()
diff --git a/pypy/objspace/flow/test/test_framestate.py b/pypy/objspace/flow/test/test_framestate.py
--- a/pypy/objspace/flow/test/test_framestate.py
+++ b/pypy/objspace/flow/test/test_framestate.py
@@ -1,6 +1,4 @@
-from py.test import raises
 from pypy.objspace.flow.model import *
-from pypy.interpreter.pycode import PyCode
 from pypy.rlib.unroll import SpecTag
 from pypy.objspace.flow.objspace import FlowObjSpace
 from pypy.objspace.flow.flowcontext import FlowSpaceFrame
diff --git a/pypy/objspace/flow/test/test_objspace.py b/pypy/objspace/flow/test/test_objspace.py
--- a/pypy/objspace/flow/test/test_objspace.py
+++ b/pypy/objspace/flow/test/test_objspace.py
@@ -1,9 +1,8 @@
 from __future__ import with_statement
 import new
 import py, sys
-from pypy.objspace.flow.model import Constant, Block, Link, Variable
+from pypy.objspace.flow.model import Constant
 from pypy.objspace.flow.model import mkentrymap, c_last_exception
-from pypy.interpreter.argument import Arguments
 from pypy.translator.simplify import simplify_graph
 from pypy.objspace.flow.objspace import FlowObjSpace
 from pypy.objspace.flow.flowcontext import FlowingError, FlowSpaceFrame