1.1 --- a/simplify/simplified/__init__.py Sun May 27 18:25:25 2007 +0200
1.2 +++ b/simplify/simplified/__init__.py Sun May 27 18:30:34 2007 +0200
1.3 @@ -23,10 +23,10 @@
1.4
1.5 __version__ = "0.1"
1.6
1.7 -from simplified.ast import *
1.8 -from simplified.data import *
1.9 -from simplified.program import *
1.10 -from simplified.utils import *
1.11 +from simplify.simplified.ast import *
1.12 +from simplify.simplified.data import *
1.13 +from simplify.simplified.program import *
1.14 +from simplify.simplified.utils import *
1.15 import os
1.16
1.17 # Location of the built-in libraries.
2.1 --- a/simplify/simplified/data.py Sun May 27 18:25:25 2007 +0200
2.2 +++ b/simplify/simplified/data.py Sun May 27 18:30:34 2007 +0200
2.3 @@ -21,7 +21,7 @@
2.4 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
2.5 """
2.6
2.7 -from simplified.utils import Structure, WithName, name
2.8 +from simplify.simplified.utils import Structure, WithName, name
2.9
2.10 # Special non-program nodes.
2.11
3.1 --- a/simplify/simplified/program.py Sun May 27 18:25:25 2007 +0200
3.2 +++ b/simplify/simplified/program.py Sun May 27 18:30:34 2007 +0200
3.3 @@ -23,7 +23,7 @@
3.4 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
3.5 """
3.6
3.7 -from simplified.utils import Structure, WithName, name
3.8 +from simplify.simplified.utils import Structure, WithName, name
3.9 import sys
3.10
3.11 # Simplified program nodes.
4.1 --- a/test.py Sun May 27 18:25:25 2007 +0200
4.2 +++ b/test.py Sun May 27 18:30:34 2007 +0200
4.3 @@ -4,7 +4,7 @@
4.4 import sys, os
4.5 sys.setrecursionlimit(10000)
4.6
4.7 - import simplified
4.8 + from simplify import simplified
4.9
4.10 if "-s" in sys.argv:
4.11 simplified.set_single_instance_mode()
4.12 @@ -15,8 +15,8 @@
4.13 elif "-mp" in sys.argv:
4.14 simplified.set_prolific_multiple_instance_mode()
4.15
4.16 - import viewer
4.17 - from annotate import AnnotationError, Importer, load
4.18 + import simplify.viewer
4.19 + from simplify.annotate import AnnotationError, Importer, load
4.20
4.21 importer = Importer(sys.path)
4.22 try:
4.23 @@ -26,6 +26,6 @@
4.24 raise
4.25 else:
4.26 if "-d" in sys.argv:
4.27 - viewer.makedocs(module, importer.modules.values(), builtins)
4.28 + simplify.viewer.makedocs(module, importer.modules.values(), builtins)
4.29
4.30 # vim: tabstop=4 expandtab shiftwidth=4