Thread: [Epydoc-commits] SF.net SVN: epydoc: [1726] trunk/epydoc/src/epydoc/cli.py (Page 3)
Brought to you by:
edloper
From: <ed...@us...> - 2008-02-16 04:49:51
|
Revision: 1726 http://epydoc.svn.sourceforge.net/epydoc/?rev=1726&view=rev Author: edloper Date: 2008-02-15 20:49:50 -0800 (Fri, 15 Feb 2008) Log Message: ----------- - Display more useful error message when '--graph' gets something unexpected. Modified Paths: -------------- trunk/epydoc/src/epydoc/cli.py Modified: trunk/epydoc/src/epydoc/cli.py =================================================================== --- trunk/epydoc/src/epydoc/cli.py 2008-02-16 04:49:21 UTC (rev 1725) +++ trunk/epydoc/src/epydoc/cli.py 2008-02-16 04:49:50 UTC (rev 1726) @@ -512,7 +512,8 @@ options.graphs = [g for g in GRAPH_TYPES if g != 'callgraph'] break elif graph_type not in GRAPH_TYPES: - optparser.error("Invalid graph type %s." % graph_type) + optparser.error("Invalid graph type %s. Expected one of: %s." % + (graph_type, ', '.join(GRAPH_TYPES + ('all',)))) # Calculate verbosity. verbosity = getattr(options, 'verbosity', 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-23 04:54:25
|
Revision: 1742 http://epydoc.svn.sourceforge.net/epydoc/?rev=1742&view=rev Author: edloper Date: 2008-02-22 20:54:23 -0800 (Fri, 22 Feb 2008) Log Message: ----------- - Added --help sty Modified Paths: -------------- trunk/epydoc/src/epydoc/cli.py Modified: trunk/epydoc/src/epydoc/cli.py =================================================================== --- trunk/epydoc/src/epydoc/cli.py 2008-02-23 04:50:41 UTC (rev 1741) +++ trunk/epydoc/src/epydoc/cli.py 2008-02-23 04:54:23 UTC (rev 1742) @@ -75,6 +75,7 @@ from epydoc.compat import * import ConfigParser from epydoc.docwriter.html_css import STYLESHEETS as CSS_STYLESHEETS +from epydoc.docwriter.latex_sty import STYLESHEETS as STY_STYLESHEETS # This module is only available if Docutils are in the system try: @@ -117,6 +118,9 @@ '\n'.join([' %10s: %s' % (key, descr) for (key, (sheet, descr)) in CSS_STYLESHEETS.items()])), + 'sty': textwrap.dedent( + 'The following built-in LaTeX style files are available:\n' + + ', '.join(STY_STYLESHEETS)), #'checks': textwrap.dedent('''\ # # '''), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-23 20:48:13
|
Revision: 1767 http://epydoc.svn.sourceforge.net/epydoc/?rev=1767&view=rev Author: edloper Date: 2008-02-23 12:48:06 -0800 (Sat, 23 Feb 2008) Log Message: ----------- - Added options --max-html-graph-size and --max-latex-graph-size Modified Paths: -------------- trunk/epydoc/src/epydoc/cli.py Modified: trunk/epydoc/src/epydoc/cli.py =================================================================== --- trunk/epydoc/src/epydoc/cli.py 2008-02-23 20:31:31 UTC (rev 1766) +++ trunk/epydoc/src/epydoc/cli.py 2008-02-23 20:48:06 UTC (rev 1767) @@ -76,6 +76,7 @@ import ConfigParser from epydoc.docwriter.html_css import STYLESHEETS as CSS_STYLESHEETS from epydoc.docwriter.latex_sty import STYLESHEETS as STY_STYLESHEETS +from epydoc.docwriter.dotgraph import DotGraph # This module is only available if Docutils are in the system try: @@ -429,6 +430,18 @@ action='append', dest='pstat_files', metavar='FILE', help="A pstat output file, to be used in generating call graphs.") + graph_group.add_option('--max-html-graph-size', + action='store', dest='max_html_graph_size', metavar='SIZE', + help="Set the maximum graph size for HTML graphs. This should " + "be a string of the form \"w,h\", specifying the maximum width " + "and height in inches. Default=%r" % DotGraph.DEFAULT_HTML_SIZE) + + graph_group.add_option('--max-latex-graph-size', + action='store', dest='max_latex_graph_size', metavar='SIZE', + help="Set the maximum graph size for LATEX graphs. This should " + "be a string of the form \"w,h\", specifying the maximum width " + "and height in inches. Default=%r" % DotGraph.DEFAULT_LATEX_SIZE) + # this option is for developers, not users. graph_group.add_option("--profile-epydoc", action="store_true", dest="profile", @@ -436,7 +449,6 @@ ("Run the hotshot profiler on epydoc itself. Output " "will be written to profile.out.")) - return_group = OptionGroup(optparser, 'Return Value Options') optparser.add_option_group(return_group) @@ -545,6 +557,18 @@ optparser.error("Use of the pdflatex driver is incompatible " "with generating dvi or ps output.") + # Set max graph sizes + if options.max_html_graph_size: + if not re.match(r'^\d+\s*,\s*\d+$', options.max_html_graph_size): + optparser.error("Bad max-html-graph-size value: %r" % + options.max_html_graph_size) + DotGraph.DEFAULT_HTML_SIZE = options.max_html_graph_size + if options.max_latex_graph_size: + if not re.match(r'^\d+\s*,\s*\d+$', options.max_latex_graph_size): + optparser.error("Bad max-latex-graph-size value: %r" % + options.max_latex_graph_size) + DotGraph.DEFAULT_LATEX_SIZE = options.max_latex_graph_size + # Calculate verbosity. verbosity = getattr(options, 'verbosity', 0) options.verbosity = verbosity + options.verbose - options.quiet @@ -663,6 +687,10 @@ options.graph_font_size = _str_to_int(val, optname) elif optname == 'pstat': options.pstat_files.extend(_str_to_list(val)) + elif optname in ('max-html-graph-size', 'max_html_graph_size'): + options.max_html_graph_size = val + elif optname in ('max-latex-graph-size', 'max_latex_graph_size'): + options.max_latex_graph_size = val # Return value options elif optname in ('failon', 'fail-on', 'fail_on'): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-24 19:43:47
|
Revision: 1787 http://epydoc.svn.sourceforge.net/epydoc/?rev=1787&view=rev Author: edloper Date: 2008-02-24 11:43:45 -0800 (Sun, 24 Feb 2008) Log Message: ----------- - Fixed bug caused my change in return value of parse_arguments Modified Paths: -------------- trunk/epydoc/src/epydoc/cli.py Modified: trunk/epydoc/src/epydoc/cli.py =================================================================== --- trunk/epydoc/src/epydoc/cli.py 2008-02-24 19:43:23 UTC (rev 1786) +++ trunk/epydoc/src/epydoc/cli.py 2008-02-24 19:43:45 UTC (rev 1787) @@ -1200,7 +1200,7 @@ return try: prof = hotshot.Profile('hotshot.out') - prof = prof.runctx('main(*parse_arguments())', globals(), {}) + prof = prof.runctx('main(parse_arguments())', globals(), {}) except SystemExit: pass prof.close() @@ -1230,7 +1230,7 @@ Profile.dispatch['c_exception'] = trace_dispatch_return try: prof = Profile() - prof = prof.runctx('main(*parse_arguments())', globals(), {}) + prof = prof.runctx('main(parse_arguments())', globals(), {}) except SystemExit: pass prof.dump_stats('profile.out') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-26 02:52:05
|
Revision: 1791 http://epydoc.svn.sourceforge.net/epydoc/?rev=1791&view=rev Author: edloper Date: 2008-02-25 18:52:04 -0800 (Mon, 25 Feb 2008) Log Message: ----------- - Fixed bug in selecting pdfdriver when pdfdriver=auto. Modified Paths: -------------- trunk/epydoc/src/epydoc/cli.py Modified: trunk/epydoc/src/epydoc/cli.py =================================================================== --- trunk/epydoc/src/epydoc/cli.py 2008-02-25 00:37:58 UTC (rev 1790) +++ trunk/epydoc/src/epydoc/cli.py 2008-02-26 02:52:04 UTC (rev 1791) @@ -1009,7 +1009,10 @@ log.start_progress('Writing LaTeX docs') # Choose a pdfdriver if we're generating pdf output. - if 'pdf' in options.actions and options.pdfdriver=='auto': + if options.pdfdriver=='auto' and ('latex' in options.actions or + 'dvi' in options.actions or + 'ps' in options.actions or + 'pdf' in options.actions): if 'dvi' in options.actions or 'ps' in options.actions: options.pdfdriver = 'latex' else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-26 03:13:32
|
Revision: 1792 http://epydoc.svn.sourceforge.net/epydoc/?rev=1792&view=rev Author: edloper Date: 2008-02-25 19:13:30 -0800 (Mon, 25 Feb 2008) Log Message: ----------- - Allow dotgraph colors to be customized via config files. Modified Paths: -------------- trunk/epydoc/src/epydoc/cli.py Modified: trunk/epydoc/src/epydoc/cli.py =================================================================== --- trunk/epydoc/src/epydoc/cli.py 2008-02-26 02:52:04 UTC (rev 1791) +++ trunk/epydoc/src/epydoc/cli.py 2008-02-26 03:13:30 UTC (rev 1792) @@ -77,6 +77,7 @@ from epydoc.docwriter.html_css import STYLESHEETS as CSS_STYLESHEETS from epydoc.docwriter.latex_sty import STYLESHEETS as STY_STYLESHEETS from epydoc.docwriter.dotgraph import DotGraph +from epydoc.docwriter.dotgraph import COLOR as GRAPH_COLOR # This module is only available if Docutils are in the system try: @@ -714,6 +715,16 @@ options.max_html_graph_size = val elif optname in ('max-latex-graph-size', 'max_latex_graph_size'): options.max_latex_graph_size = val + elif optname.startswith('graph-'): + color = optname[6:].upper().strip() + color = color.replace('-', '_') + color = color.replace('_BACKGROUND', '_BG') + if color in GRAPH_COLOR: + if not re.match(r'#[a-fA-F0-9]+|\w+', val): + raise ValueError('Bad color %r for %r' % (val, color)) + GRAPH_COLOR[color] = val + else: + raise ValueError('Unknown option %s' % optname) # Return value options elif optname in ('failon', 'fail-on', 'fail_on'): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-27 00:02:36
|
Revision: 1800 http://epydoc.svn.sourceforge.net/epydoc/?rev=1800&view=rev Author: edloper Date: 2008-02-26 16:02:34 -0800 (Tue, 26 Feb 2008) Log Message: ----------- - Added --graph-image-format option Modified Paths: -------------- trunk/epydoc/src/epydoc/cli.py Modified: trunk/epydoc/src/epydoc/cli.py =================================================================== --- trunk/epydoc/src/epydoc/cli.py 2008-02-27 00:01:42 UTC (rev 1799) +++ trunk/epydoc/src/epydoc/cli.py 2008-02-27 00:02:34 UTC (rev 1800) @@ -462,6 +462,12 @@ "be a string of the form \"w,h\", specifying the maximum width " "and height in inches. Default=%r" % DotGraph.DEFAULT_LATEX_SIZE) + graph_group.add_option('--graph-image-format', + dest='graph_image_format', metavar='FORMAT', + help="Specify the file format used for graph images in the HTML " + "output. Can be one of gif, png, jpg. Default=%r" % + DotGraph.DEFAULT_HTML_IMAGE_FORMAT) + # this option is for developers, not users. graph_group.add_option("--profile-epydoc", action="store_true", dest="profile", @@ -577,7 +583,7 @@ optparser.error("Use of the pdflatex driver is incompatible " "with generating dvi or ps output.") - # Set max graph sizes + # Set graph defaults if options.max_html_graph_size: if not re.match(r'^\d+\s*,\s*\d+$', options.max_html_graph_size): optparser.error("Bad max-html-graph-size value: %r" % @@ -588,6 +594,11 @@ optparser.error("Bad max-latex-graph-size value: %r" % options.max_latex_graph_size) DotGraph.DEFAULT_LATEX_SIZE = options.max_latex_graph_size + if options.graph_image_format: + if options.graph_image_format not in ('jpg', 'png', 'gif'): + optparser.error("Bad graph-image-format %r; expected one of: " + "jpg, png, gif." % options.graph_image_format) + DotGraph.DEFAULT_HTML_IMAGE_FORMAT = options.graph_image_format # Calculate verbosity. verbosity = getattr(options, 'verbosity', 0) @@ -715,6 +726,8 @@ options.max_html_graph_size = val elif optname in ('max-latex-graph-size', 'max_latex_graph_size'): options.max_latex_graph_size = val + elif optname in ('graph-image-format', 'graph_image_format'): + options.graph_image_format = val elif optname.startswith('graph-'): color = optname[6:].upper().strip() color = color.replace('-', '_') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ed...@us...> - 2008-02-27 00:20:29
|
Revision: 1801 http://epydoc.svn.sourceforge.net/epydoc/?rev=1801&view=rev Author: edloper Date: 2008-02-26 16:20:24 -0800 (Tue, 26 Feb 2008) Log Message: ----------- - Fixed silly typo Modified Paths: -------------- trunk/epydoc/src/epydoc/cli.py Modified: trunk/epydoc/src/epydoc/cli.py =================================================================== --- trunk/epydoc/src/epydoc/cli.py 2008-02-27 00:02:34 UTC (rev 1800) +++ trunk/epydoc/src/epydoc/cli.py 2008-02-27 00:20:24 UTC (rev 1801) @@ -776,6 +776,12 @@ ###################################################################### def main(options): + """ + Perform all actions indicated by the given set of options. + + @return: the L{epydoc.apidoc.DocIndex} object created while + running epydoc (or None). + """ # Set the debug flag, if '--debug' was specified. if options.debug: epydoc.DEBUG = True @@ -982,6 +988,9 @@ # Deregister our logger(s). for logger in loggers: log.remove_logger(logger) + + # Return the docindex, in case someone wants to use it programatically. + return docindex def write_html(docindex, options): from epydoc.docwriter.html import HTMLWriter @@ -1191,6 +1200,12 @@ DocChecker(docindex).check() def cli(): + """ + Perform all actions indicated by the options in sys.argv. + + @return: the L{epydoc.apidoc.DocIndex} object created while + running epydoc (or None). + """ # Parse command-line arguments. options = parse_arguments() @@ -1199,7 +1214,7 @@ if options.profile: _profile() else: - main(options) + return main(options) finally: log.close() except SystemExit: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |