[Epydoc-commits] SF.net SVN: epydoc: [1549] trunk/epydoc

[<dva...@us...>]

Revision: 1549
          http://svn.sourceforge.net/epydoc/?rev=1549&view=rev
Author:   dvarrazzo
Date:     2007-02-24 08:23:49 -0800 (Sat, 24 Feb 2007)

Log Message:
-----------
- Fixed a couple of bugs in config file parsing
- Fixed config example for fail-on option

Modified Paths:
--------------
    trunk/epydoc/doc/manual-reference.txt
    trunk/epydoc/src/epydoc/cli.py

Modified: trunk/epydoc/doc/manual-reference.txt
===================================================================
--- trunk/epydoc/doc/manual-reference.txt	2007-02-22 00:25:40 UTC (rev 1548)
+++ trunk/epydoc/doc/manual-reference.txt	2007-02-24 16:23:49 UTC (rev 1549)
@@ -219,28 +219,28 @@
     **### Output options**
 
     *# The documented project's name.*
-    **name: Example**
+    **#name: Example**
 
     *# The CSS stylesheet for HTML output.  Can be the name of a builtin*
     *# stylesheet, or the name of a file.*
     **css: white**
 
     *# The documented project's URL.*
-    **url: http://some.project/**
+    **#url: http://some.project/**
 
     *# HTML code for the project link in the navigation bar.  If left*
     *# unspecified, the project link will be generated based on the*
     *# project's name and URL.*
-    **link: <a href="somewhere">My Cool Project</a>**
+    **#link: <a href="somewhere">My Cool Project</a>**
 
     *# The "top" page for the documentation.  Can be a URL, the name*
     *# of a module or class, or one of the special names "trees.html",*
     *# "indices.html", or "help.html"*
-    **top: os.path**
+    **#top: os.path**
 
     *# An alternative help file.  The named file should contain the*
     *# body of an HTML file; navigation bars will be added to it.*
-    **help: my_helpfile.html**
+    **#help: my_helpfile.html**
 
     *# Whether or not to include a frames-based table of contents.*
     **frames: yes**
@@ -283,27 +283,17 @@
     *# (e.g., helvetica or times).*
     **graph-font: Helvetica**
 
-    *# Specify the font size used to generate Graphviz*
+    *# Specify the font size used to generate Graphviz graphs.*
     **graph-font-size: 10**
 
 
     **### Return value options**
 
-    *# If true, return a non-zero exit status, indicating failure,*
-    *# if any errors are encountered.*
-    **fail-on-error: false**
+    *# The condition upon which Epydoc should exit with a non-zero*
+    *# exit status. Possible values are error, warning, docstring_warning*
+    **#fail-on: error**
 
-    *# If true, return a non-zero exit status, indicating failure,*
-    *# if any errors or warnings are encountered (not including*
-    *# docstring warnings).*
-    **fail-on-warning: false**
-    
-    *# Return a non-zero exit status, indicating failure, if any*
-    *# errors or warnings are encountered (including docstring*
-    *# warnings).*
-    **fail-on-docstring-warning: false**
 
-
 Warnings and Errors
 -------------------
 

Modified: trunk/epydoc/src/epydoc/cli.py
===================================================================
--- trunk/epydoc/src/epydoc/cli.py	2007-02-22 00:25:40 UTC (rev 1548)
+++ trunk/epydoc/src/epydoc/cli.py	2007-02-24 16:23:49 UTC (rev 1549)
@@ -587,18 +587,18 @@
         elif optname in ('graph-font', 'graph_font'):
             options.graph_font = val
         elif optname in ('graph-font-size', 'graph_font_size'):
-            options.graph_font_size = _str_to_int(val)
+            options.graph_font_size = _str_to_int(val, optname)
         elif optname == 'pstat':
             options.pstat_files.extend(val.replace(',', ' ').split())
 
         # Return value options
         elif optname in ('failon', 'fail-on', 'fail_on'):
-            if val.lower.strip() in ('error', 'errors'):
+            if val.lower().strip() in ('error', 'errors'):
                 options.fail_on = log.ERROR
-            elif val.lower.strip() in ('warning', 'warnings'):
+            elif val.lower().strip() in ('warning', 'warnings'):
                 options.fail_on = log.WARNING
-            elif val.lower.strip() in ('docstring_warning',
-                                       'docstring_warnings'):
+            elif val.lower().strip() in ('docstring_warning',
+                                         'docstring_warnings'):
                 options.fail_on = log.DOCSTRING_WARNING
             else:
                 raise ValueError("%r expected one of: error, warning, "


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.