[pypy-svn] r15013 - pypy/dist/pypy/translator

[arigo at codespeak.net]

Author: arigo
Date: Mon Jul 25 13:57:23 2005
New Revision: 15013

Modified:
   pypy/dist/pypy/translator/backendoptimization.py
   pypy/dist/pypy/translator/geninterplevel.py
Log:
Removed import dependencies (avoid having pypy.annotation imported when py.py
starts).


Modified: pypy/dist/pypy/translator/backendoptimization.py
==============================================================================
--- pypy/dist/pypy/translator/backendoptimization.py	(original)
+++ pypy/dist/pypy/translator/backendoptimization.py	Mon Jul 25 13:57:23 2005
@@ -5,7 +5,6 @@
 from pypy.objspace.flow.model import traverse, mkentrymap, checkgraph
 from pypy.tool.unionfind import UnionFind
 from pypy.rpython.lltype import Void
-from pypy.rpython.extfunctable import table as extfunctable
 
 def remove_same_as(graph):
     """Remove all 'same_as' operations.
@@ -59,6 +58,7 @@
         traverse(visit, graph)
  
 def rename_extfunc_calls(translator):
+    from pypy.rpython.extfunctable import table as extfunctable
     def visit(block): 
         if isinstance(block, Block):
             for op in block.operations:

Modified: pypy/dist/pypy/translator/geninterplevel.py
==============================================================================
--- pypy/dist/pypy/translator/geninterplevel.py	(original)
+++ pypy/dist/pypy/translator/geninterplevel.py	Mon Jul 25 13:57:23 2005
@@ -52,7 +52,6 @@
 from pypy.objspace.flow.model import last_exception
 from pypy.objspace.flow.model import traverse, uniqueitems, checkgraph
 from pypy.interpreter.pycode import CO_VARARGS, CO_VARKEYWORDS
-from pypy.annotation import model as annmodel
 from types import FunctionType, CodeType, ModuleType
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.argument import Arguments