[z3-checkins] r34067 - in z3/deliverance/branches/packaged: . deliverance

[cabraham at codespeak.net]

Author: cabraham
Date: Thu Nov  2 17:46:18 2006
New Revision: 34067

Modified:
   z3/deliverance/branches/packaged/README.txt
   z3/deliverance/branches/packaged/deliverance/handtransform.py
   z3/deliverance/branches/packaged/setup.py
Log:
made handtransform into an executable, installed in setup.py

Modified: z3/deliverance/branches/packaged/README.txt
==============================================================================
--- z3/deliverance/branches/packaged/README.txt	(original)
+++ z3/deliverance/branches/packaged/README.txt	Thu Nov  2 17:46:18 2006
@@ -43,8 +43,8 @@
 
 Create a working enviornment for deliverance and its dependencies:  
 
-workingenv.py deliverance_env
-source deliverance_env/bin/activate
+$ workingenv.py deliverance_env
+$ source deliverance_env/bin/activate
 
 install a recent cvs version of libxml2,libxstl and svn lxml. 
 You are likely to encounter segfaults and other failures if recent versions are not used.

Modified: z3/deliverance/branches/packaged/deliverance/handtransform.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/handtransform.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/handtransform.py	Thu Nov  2 17:46:18 2006
@@ -24,6 +24,20 @@
 
 DEFAULT_BASE_URL = "http://www.example.com"
 
+usage = "usage: %prog [options] <content_url>"
+parser = OptionParser(usage=usage)
+parser.add_option("-t","--theme",dest="theme_url",help="url of theme html")
+parser.add_option("-b","--baseurl",dest="base_url",
+                  help="relative urls in the theme will be made absolute relative to this url [default %default]", 
+                  default=DEFAULT_BASE_URL)
+parser.add_option("-r","--rules",dest="rules_file",
+                  help="path to file containing the deliverance rules to apply")
+parser.add_option("-f","--from-file",dest="blend_file",
+                  help="take theme, baseurl and rules parameters from the referenced file")
+parser.add_option("-R","--renderer",dest="renderer_type",
+                  help="(xslt|py) [default %default]", default="xslt", choices=['xslt','py'])
+
+
 
 def grab_url(url):
     f = urllib.urlopen(url)
@@ -65,23 +79,11 @@
     parser.print_usage()
     sys.exit(0)    
     
-if __name__ == '__main__':
-
+def main(args=None):
+    if args is None:
+        args = sys.argv[1:]
 
-    usage = "usage: %prog [options] <content_url>"
-    parser = OptionParser(usage=usage)
-    parser.add_option("-t","--theme",dest="theme_url",help="url of theme html")
-    parser.add_option("-b","--baseurl",dest="base_url",
-                      help="relative urls in the theme will be made absolute relative to this url [default %default]", 
-                      default=DEFAULT_BASE_URL)
-    parser.add_option("-r","--rules",dest="rules_file",
-                      help="path to file containing the deliverance rules to apply")
-    parser.add_option("-f","--from-file",dest="blend_file",
-                      help="take theme, baseurl and rules parameters from the referenced file")
-    parser.add_option("-R","--renderer",dest="renderer_type",
-                      help="(xslt|py) [default %default]", default="xslt", choices=['xslt','py'])
-
-    (options,args) = parser.parse_args()
+    options,args = parser.parse_args(args)
     
     if len(args) == 0:
         die("no content url specified.",parser)
@@ -120,3 +122,6 @@
 
     print tostring(do_transform(options.renderer_type,theme_url,base_url,rules_file,content_url))
     
+
+if __name__ == '__main__':
+    main()

Modified: z3/deliverance/branches/packaged/setup.py
==============================================================================
--- z3/deliverance/branches/packaged/setup.py	(original)
+++ z3/deliverance/branches/packaged/setup.py	Thu Nov  2 17:46:18 2006
@@ -34,6 +34,7 @@
       deliverance-proxy = deliverance.proxycommand:main
       deliverance-tests = deliverance.tests:main
       deliverance-speed = deliverance.test_speed:main
+      deliverance-handtransform = deliverance.handtransform:main
       """,
       )