1.1 --- a/test.py Sat Dec 09 00:36:06 2006 +0100
1.2 +++ b/test.py Sat Dec 09 02:16:20 2006 +0100
1.3 @@ -2,15 +2,18 @@
1.4
1.5 import sys, os
1.6 import viewer
1.7 -from annotate import Importer, load
1.8 +from annotate import AnnotationError, Importer, load
1.9
1.10 if __name__ == "__main__":
1.11
1.12 importer = Importer(sys.path)
1.13 - builtins = load(os.path.join("lib", "builtins.py"))
1.14 - module = load(sys.argv[1], builtins, importer)
1.15 -
1.16 - if "-d" in sys.argv:
1.17 - viewer.makedocs(module, importer.modules, builtins)
1.18 + try:
1.19 + builtins = load(os.path.join("lib", "builtins.py"))
1.20 + module = load(sys.argv[1], builtins, None, importer)
1.21 + except AnnotationError, exc:
1.22 + raise
1.23 + else:
1.24 + if "-d" in sys.argv:
1.25 + viewer.makedocs(module, importer.modules.values(), builtins)
1.26
1.27 # vim: tabstop=4 expandtab shiftwidth=4