[Zope3-checkins] SVN: Zope3/trunk/ Fixed bin/static-apidoc, which had a NameError. Also made

[Shane Hathaway]

Log message for revision 41361:
  Fixed bin/static-apidoc, which had a NameError.  Also made
  it a little more self-explanatory.
  

Changed:
  U   Zope3/trunk/doc/CHANGES.txt
  U   Zope3/trunk/src/zope/app/apidoc/static.py
  U   Zope3/trunk/zopeskel/bin/static-apidoc.in

-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt	2006-01-19 04:43:41 UTC (rev 41360)
+++ Zope3/trunk/doc/CHANGES.txt	2006-01-19 05:16:12 UTC (rev 41361)
@@ -18,6 +18,9 @@
         then use that to sort strings, such as menu entries, in a
         locale-specific fashion.
 
+      - By default, persistent logs now contain the same extra
+        traceback information that's visible through the web.
+
     Restructuring
 
       - Removed unused menus and made previous titles, the description,
@@ -48,11 +51,14 @@
       - Fixed issue 497: HTTP DELETE now returns 405 Method Not Allowed
         when the container cannot be adapted to IWriteDirectory.
 
+      - Fixed a NameError in bin/static-apidoc.
+
     Much thanks to everyone who contributed to this release:
 
       Jim Fulton, Marius Gedminas, Brian Sutherland, Stephan Richter, Dmitry
       Vasiliev, Tim Peters, Zachery Bir, Gary Poster, Egon Frerich, Zhiyun
-      (Simon) Hang, Tadashi Matsumoto, Simon Michael, Encople Degoute
+      (Simon) Hang, Tadashi Matsumoto, Simon Michael, Encople Degoute,
+      Shane Hathaway
 
   ------------------------------------------------------------------
 

Modified: Zope3/trunk/src/zope/app/apidoc/static.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/static.py	2006-01-19 04:43:41 UTC (rev 41360)
+++ Zope3/trunk/src/zope/app/apidoc/static.py	2006-01-19 05:16:12 UTC (rev 41361)
@@ -340,7 +340,7 @@
 ###############################################################################
 # Command-line UI
 
-parser = optparse.OptionParser("Usage: %prog [options] TARGET_DIR")
+parser = optparse.OptionParser("%prog [options] TARGET_DIR")
 
 ######################################################################
 # Retrieval
@@ -488,6 +488,8 @@
     merge_options(options, defaults)
     options.original_testrunner_args = original_testrunner_args
 
+    if not positional:
+        parser.error("No target directory specified.")
     options.target_dir = positional.pop()
 
     return options

Modified: Zope3/trunk/zopeskel/bin/static-apidoc.in
===================================================================
--- Zope3/trunk/zopeskel/bin/static-apidoc.in	2006-01-19 04:43:41 UTC (rev 41360)
+++ Zope3/trunk/zopeskel/bin/static-apidoc.in	2006-01-19 05:16:12 UTC (rev 41361)
@@ -21,6 +21,7 @@
 
 SOFTWARE_HOME = r"<<SOFTWARE_HOME>>"
 
+here = os.path.dirname(__file__)
 instance_lib = os.path.join(here, "lib", "python")
 
 sys.path[:0] = [instance_lib, SOFTWARE_HOME]