# HG changeset patch
# User paulb@localhost.localdomain
# Date 1165015074 -3600
# Node ID 3e63ed6f2d740e049b27e3dcc9d3b78db1d39f98
# Parent  24ac3f8de5993825d35ca736737b29f84a301972
Reorganised the test program in preparation for tool creation.


diff -r 24ac3f8de599 -r 3e63ed6f2d74 test.py
--- a/test.py	Sat Dec 02 00:14:33 2006 +0100
+++ b/test.py	Sat Dec 02 00:17:54 2006 +0100
@@ -6,21 +6,7 @@
 import viewer
 from annotate import AnnotationError, annotate_all as aa
 
-builtins = simplify.simplify(os.path.join("lib", "builtins.py"), 1)
-module = simplify.simplify(sys.argv[1])
-fixnames.fix(builtins)
-fixnames.fix(module, builtins)
-
-stream = sys.stdout
-v = viewer.Viewer(stream)
-
-if "-a" in sys.argv:
-    try:
-        aa([module], builtins)
-    except AnnotationError, exc:
-        v.report(exc)
-
-if "-d" in sys.argv:
+def makedoc(viewer, module, builtins):
     try:
         dirname = "%s-docs" % module.name
         if not os.path.exists(dirname):
@@ -30,4 +16,23 @@
     except viewer.ViewerError, exc:
         raise
 
+if __name__ == "__main__":
+
+    builtins = simplify.simplify(os.path.join("lib", "builtins.py"), 1)
+    module = simplify.simplify(sys.argv[1])
+    fixnames.fix(builtins)
+    fixnames.fix(module, builtins)
+
+    stream = sys.stdout
+    v = viewer.Viewer(stream)
+
+    if "-a" in sys.argv:
+        try:
+            aa([module], builtins)
+        except AnnotationError, exc:
+            v.report(exc)
+
+    if "-d" in sys.argv:
+        makedoc(viewer, module, builtins)
+
 # vim: tabstop=4 expandtab shiftwidth=4