# HG changeset patch
# User paulb@localhost.localdomain
# Date 1180283434 -7200
# Node ID 1233b49abe978bea98e78dc63dd267ebbf357795
# Parent  efe3cfb9196659f0a88cab3576516c0cfec9f318
Fixed imports.


diff -r efe3cfb91966 -r 1233b49abe97 simplify/simplified/__init__.py
--- a/simplify/simplified/__init__.py	Sun May 27 18:25:25 2007 +0200
+++ b/simplify/simplified/__init__.py	Sun May 27 18:30:34 2007 +0200
@@ -23,10 +23,10 @@
 
 __version__ = "0.1"
 
-from simplified.ast import *
-from simplified.data import *
-from simplified.program import *
-from simplified.utils import *
+from simplify.simplified.ast import *
+from simplify.simplified.data import *
+from simplify.simplified.program import *
+from simplify.simplified.utils import *
 import os
 
 # Location of the built-in libraries.
diff -r efe3cfb91966 -r 1233b49abe97 simplify/simplified/data.py
--- a/simplify/simplified/data.py	Sun May 27 18:25:25 2007 +0200
+++ b/simplify/simplified/data.py	Sun May 27 18:30:34 2007 +0200
@@ -21,7 +21,7 @@
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-from simplified.utils import Structure, WithName, name
+from simplify.simplified.utils import Structure, WithName, name
 
 # Special non-program nodes.
 
diff -r efe3cfb91966 -r 1233b49abe97 simplify/simplified/program.py
--- a/simplify/simplified/program.py	Sun May 27 18:25:25 2007 +0200
+++ b/simplify/simplified/program.py	Sun May 27 18:30:34 2007 +0200
@@ -23,7 +23,7 @@
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-from simplified.utils import Structure, WithName, name
+from simplify.simplified.utils import Structure, WithName, name
 import sys
 
 # Simplified program nodes.
diff -r efe3cfb91966 -r 1233b49abe97 test.py
--- a/test.py	Sun May 27 18:25:25 2007 +0200
+++ b/test.py	Sun May 27 18:30:34 2007 +0200
@@ -4,7 +4,7 @@
     import sys, os
     sys.setrecursionlimit(10000)
 
-    import simplified
+    from simplify import simplified
 
     if "-s" in sys.argv:
         simplified.set_single_instance_mode()
@@ -15,8 +15,8 @@
     elif "-mp" in sys.argv:
         simplified.set_prolific_multiple_instance_mode()
 
-    import viewer
-    from annotate import AnnotationError, Importer, load
+    import simplify.viewer
+    from simplify.annotate import AnnotationError, Importer, load
 
     importer = Importer(sys.path)
     try:
@@ -26,6 +26,6 @@
         raise
     else:
         if "-d" in sys.argv:
-            viewer.makedocs(module, importer.modules.values(), builtins)
+            simplify.viewer.makedocs(module, importer.modules.values(), builtins)
 
 # vim: tabstop=4 expandtab shiftwidth=4