1.1 --- a/test.py Wed Dec 06 23:54:48 2006 +0100
1.2 +++ b/test.py Fri Dec 08 23:41:20 2006 +0100
1.3 @@ -1,22 +1,16 @@
1.4 #!/usr/bin/env python
1.5
1.6 import sys, os
1.7 -import simplify
1.8 -import fixnames
1.9 import viewer
1.10 -from annotate import AnnotationError, annotate_all as aa
1.11 +from annotate import Importer, load
1.12
1.13 if __name__ == "__main__":
1.14
1.15 - builtins = simplify.simplify(os.path.join("lib", "builtins.py"), 1)
1.16 - module = simplify.simplify(sys.argv[1])
1.17 - fixnames.fix(builtins)
1.18 - fixnames.fix(module, builtins)
1.19 -
1.20 - if "-a" in sys.argv:
1.21 - aa([module], builtins)
1.22 + importer = Importer(sys.path)
1.23 + builtins = load(os.path.join("lib", "builtins.py"))
1.24 + module = load(sys.argv[1], builtins, importer)
1.25
1.26 if "-d" in sys.argv:
1.27 - viewer.makedocs(module, builtins)
1.28 + viewer.makedocs(module, importer.modules, builtins)
1.29
1.30 # vim: tabstop=4 expandtab shiftwidth=4