[Zope-Checkins] CVS: Zope2 - future.py:1.1.2.2 pyassem.py:1.1.2.2 pycodegen.py:1.1.2.2 symbols.py:1.1.2.2 visitor.py:1.1.2.2
shane@digicool.com
shane@digicool.com
Thu, 19 Apr 2001 18:47:03 -0400 (EDT)
Update of /cvs-repository/Zope2/lib/python/RestrictedPython/compiler
In directory korak:/tmp/cvs-serv5071
Modified Files:
Tag: RestrictedPythonBranch
future.py pyassem.py pycodegen.py symbols.py visitor.py
Log Message:
Made compiler capable of living in a sub-package by fixing imports
--- Updated File future.py in package Zope2 --
--- future.py 2001/04/18 18:45:42 1.1.2.1
+++ future.py 2001/04/19 22:47:02 1.1.2.2
@@ -2,7 +2,8 @@
"""
-from compiler import ast, walk
+import ast
+from visitor import walk
def is_future(stmt):
"""Return true if statement is a well-formed future statement"""
--- Updated File pyassem.py in package Zope2 --
--- pyassem.py 2001/04/18 18:45:42 1.1.2.1
+++ pyassem.py 2001/04/19 22:47:02 1.1.2.2
@@ -6,7 +6,7 @@
import sys
import types
-from compiler import misc
+import misc
def xxx_sort(l):
l = l[:]
--- Updated File pycodegen.py in package Zope2 --
--- pycodegen.py 2001/04/18 18:45:42 1.1.2.1
+++ pycodegen.py 2001/04/19 22:47:02 1.1.2.2
@@ -8,10 +8,12 @@
import types
from cStringIO import StringIO
-from compiler import ast, parse, walk
-from compiler import pyassem, misc, future, symbols
-from compiler.consts import SC_LOCAL, SC_GLOBAL, SC_FREE, SC_CELL
-from compiler.pyassem import CO_VARARGS, CO_VARKEYWORDS, CO_NEWLOCALS,\
+import ast
+from transformer import parse
+from visitor import walk
+import pyassem, misc, future, symbols
+from consts import SC_LOCAL, SC_GLOBAL, SC_FREE, SC_CELL
+from pyassem import CO_VARARGS, CO_VARKEYWORDS, CO_NEWLOCALS,\
CO_NESTED, TupleArg
# Do we have Python 1.x or Python 2.x?
--- Updated File symbols.py in package Zope2 --
--- symbols.py 2001/04/18 18:45:42 1.1.2.1
+++ symbols.py 2001/04/19 22:47:02 1.1.2.2
@@ -1,7 +1,7 @@
"""Module symbol-table generator"""
-from compiler import ast
-from compiler.consts import SC_LOCAL, SC_GLOBAL, SC_FREE, SC_CELL, SC_UNKNOWN
+import ast
+from consts import SC_LOCAL, SC_GLOBAL, SC_FREE, SC_CELL, SC_UNKNOWN
import types
import sys
--- Updated File visitor.py in package Zope2 --
--- visitor.py 2001/04/18 18:45:42 1.1.2.1
+++ visitor.py 2001/04/19 22:47:02 1.1.2.2
@@ -1,5 +1,5 @@
import sys
-from compiler import ast
+import ast
class ASTVisitor:
"""Performs a depth-first walk of the AST