[pypy-svn] r14208 - pypy/dist/pypy/interpreter/stablecompiler

[adim at codespeak.net]

Author: adim
Date: Mon Jul  4 13:35:20 2005
New Revision: 14208

Modified:
   pypy/dist/pypy/interpreter/stablecompiler/future.py
   pypy/dist/pypy/interpreter/stablecompiler/pyassem.py
   pypy/dist/pypy/interpreter/stablecompiler/pycodegen.py
   pypy/dist/pypy/interpreter/stablecompiler/symbols.py
   pypy/dist/pypy/interpreter/stablecompiler/syntax.py
   pypy/dist/pypy/interpreter/stablecompiler/transformer.py
   pypy/dist/pypy/interpreter/stablecompiler/visitor.py
Log:
changed all original imports from compiler to pypy.interpreter.stablecompiler



Modified: pypy/dist/pypy/interpreter/stablecompiler/future.py
==============================================================================
--- pypy/dist/pypy/interpreter/stablecompiler/future.py	(original)
+++ pypy/dist/pypy/interpreter/stablecompiler/future.py	Mon Jul  4 13:35:20 2005
@@ -2,7 +2,7 @@
 
 """
 
-from compiler import ast, walk
+from pypy.interpreter.stablecompiler import ast, walk
 
 def is_future(stmt):
     """Return true if statement is a well-formed future statement"""
@@ -61,7 +61,7 @@
 
 if __name__ == "__main__":
     import sys
-    from compiler import parseFile, walk
+    from pypy.interpreter.stablecompiler import parseFile, walk
 
     for file in sys.argv[1:]:
         print file

Modified: pypy/dist/pypy/interpreter/stablecompiler/pyassem.py
==============================================================================
--- pypy/dist/pypy/interpreter/stablecompiler/pyassem.py	(original)
+++ pypy/dist/pypy/interpreter/stablecompiler/pyassem.py	Mon Jul  4 13:35:20 2005
@@ -5,8 +5,8 @@
 import sys
 import types
 
-from compiler import misc
-from compiler.consts \
+from pypy.interpreter.stablecompiler import misc
+from pypy.interpreter.stablecompiler.consts \
      import CO_OPTIMIZED, CO_NEWLOCALS, CO_VARARGS, CO_VARKEYWORDS
 
 class FlowGraph:

Modified: pypy/dist/pypy/interpreter/stablecompiler/pycodegen.py
==============================================================================
--- pypy/dist/pypy/interpreter/stablecompiler/pycodegen.py	(original)
+++ pypy/dist/pypy/interpreter/stablecompiler/pycodegen.py	Mon Jul  4 13:35:20 2005
@@ -6,12 +6,13 @@
 import types
 from cStringIO import StringIO
 
-from compiler import ast, parse, walk, syntax
-from compiler import pyassem, misc, future, symbols
-from compiler.consts import SC_LOCAL, SC_GLOBAL, SC_FREE, SC_CELL
-from compiler.consts import CO_VARARGS, CO_VARKEYWORDS, CO_NEWLOCALS,\
-     CO_NESTED, CO_GENERATOR, CO_GENERATOR_ALLOWED, CO_FUTURE_DIVISION
-from compiler.pyassem import TupleArg
+from pypy.interpreter.stablecompiler import ast, parse, walk, syntax
+from pypy.interpreter.stablecompiler import pyassem, misc, future, symbols
+from pypy.interpreter.stablecompiler.consts import SC_LOCAL, SC_GLOBAL, \
+    SC_FREE, SC_CELL
+from pypy.interpreter.stablecompiler.consts import CO_VARARGS, CO_VARKEYWORDS, \
+    CO_NEWLOCALS, CO_NESTED, CO_GENERATOR, CO_GENERATOR_ALLOWED, CO_FUTURE_DIVISION
+from pypy.interpreter.stablecompiler.pyassem import TupleArg
 
 # XXX The version-specific code can go, since this code only works with 2.x.
 # Do we have Python 1.x or Python 2.x?

Modified: pypy/dist/pypy/interpreter/stablecompiler/symbols.py
==============================================================================
--- pypy/dist/pypy/interpreter/stablecompiler/symbols.py	(original)
+++ pypy/dist/pypy/interpreter/stablecompiler/symbols.py	Mon Jul  4 13:35:20 2005
@@ -1,8 +1,9 @@
 """Module symbol-table generator"""
 
-from compiler import ast
-from compiler.consts import SC_LOCAL, SC_GLOBAL, SC_FREE, SC_CELL, SC_UNKNOWN
-from compiler.misc import mangle
+from pypy.interpreter.stablecompiler import ast
+from pypy.interpreter.stablecompiler.consts import SC_LOCAL, SC_GLOBAL, \
+    SC_FREE, SC_CELL, SC_UNKNOWN
+from pypy.interpreter.stablecompiler.misc import mangle
 import types
 
 
@@ -419,7 +420,7 @@
 
 if __name__ == "__main__":
     import sys
-    from compiler import parseFile, walk
+    from pypy.interpreter.stablecompiler import parseFile, walk
     import symtable
 
     def get_names(syms):

Modified: pypy/dist/pypy/interpreter/stablecompiler/syntax.py
==============================================================================
--- pypy/dist/pypy/interpreter/stablecompiler/syntax.py	(original)
+++ pypy/dist/pypy/interpreter/stablecompiler/syntax.py	Mon Jul  4 13:35:20 2005
@@ -9,7 +9,7 @@
 errors.
 """
 
-from compiler import ast, walk
+from pypy.interpreter.stablecompiler import ast, walk
 
 def check(tree, multi=None):
     v = SyntaxErrorChecker(multi)

Modified: pypy/dist/pypy/interpreter/stablecompiler/transformer.py
==============================================================================
--- pypy/dist/pypy/interpreter/stablecompiler/transformer.py	(original)
+++ pypy/dist/pypy/interpreter/stablecompiler/transformer.py	Mon Jul  4 13:35:20 2005
@@ -25,7 +25,7 @@
 #   http://www.opensource.org/licenses/bsd-license.html
 # and replace OWNER, ORGANIZATION, and YEAR as appropriate.
 
-from compiler.ast import *
+from pypy.interpreter.stablecompiler.ast import *
 import parser
 import symbol
 import token

Modified: pypy/dist/pypy/interpreter/stablecompiler/visitor.py
==============================================================================
--- pypy/dist/pypy/interpreter/stablecompiler/visitor.py	(original)
+++ pypy/dist/pypy/interpreter/stablecompiler/visitor.py	Mon Jul  4 13:35:20 2005
@@ -1,4 +1,4 @@
-from compiler import ast
+from pypy.interpreter.stablecompiler import ast
 
 # XXX should probably rename ASTVisitor to ASTWalker
 # XXX can it be made even more generic?