From: <fwi...@us...> - 2006-11-13 06:07:18
|
Author: fwiemann Date: 2006-11-13 07:07:13 +0100 (Mon, 13 Nov 2006) New Revision: 4815 Modified: branches/docutils-0.4/docutils/frontend.py branches/docutils-0.4/docutils/parsers/rst/__init__.py branches/docutils-0.4/docutils/readers/standalone.py branches/docutils-0.4/docutils/writers/html4css1/__init__.py branches/docutils-0.4/docutils/writers/s5_html/__init__.py branches/docutils-0.4/test/data/config_1.txt branches/docutils-0.4/test/test_settings.py Log: backported r4802 and r4805 Modified: branches/docutils-0.4/docutils/frontend.py =================================================================== --- branches/docutils-0.4/docutils/frontend.py 2006-11-13 05:57:21 UTC (rev 4814) +++ branches/docutils-0.4/docutils/frontend.py 2006-11-13 06:07:13 UTC (rev 4815) @@ -344,8 +344,7 @@ 'default': 1, 'validator': validate_boolean}), ('Disable Docutils section numbering (default: enabled).', ['--no-section-numbering'], - {'action': 'store_false', 'dest': 'sectnum_xform', - 'validator': validate_boolean}), + {'action': 'store_false', 'dest': 'sectnum_xform'}), ('Remove comment elements from the document tree ' '(default: leave them).', ['--strip-comments'], @@ -353,8 +352,7 @@ ('Leave comment elements in the document tree ' '(this is the default).', ['--leave-comments'], - {'action': 'store_false', 'dest': 'strip_comments', - 'validator': validate_boolean}), + {'action': 'store_false', 'dest': 'strip_comments'}), ('Set verbosity threshold; report system messages at or higher than ' '<level> (by name or number: "info" or "1", warning/2, error/3, ' 'severe/4; also, "none" or "5"). Default is 2 (warning).', Modified: branches/docutils-0.4/docutils/parsers/rst/__init__.py =================================================================== --- branches/docutils-0.4/docutils/parsers/rst/__init__.py 2006-11-13 05:57:21 UTC (rev 4814) +++ branches/docutils-0.4/docutils/parsers/rst/__init__.py 2006-11-13 06:07:13 UTC (rev 4815) @@ -112,24 +112,25 @@ {'action': 'store_true', 'validator': frontend.validate_boolean}), ('Leave spaces before footnote references.', ['--leave-footnote-reference-space'], - {'action': 'store_false', 'dest': 'trim_footnote_reference_space', - 'validator': frontend.validate_boolean}), + {'action': 'store_false', 'dest': 'trim_footnote_reference_space'}), ('Disable directives that insert the contents of external file ' '("include" & "raw"); replaced with a "warning" system message.', ['--no-file-insertion'], {'action': 'store_false', 'default': 1, - 'dest': 'file_insertion_enabled'}), + 'dest': 'file_insertion_enabled', + 'validator': frontend.validate_boolean}), ('Enable directives that insert the contents of external file ' '("include" & "raw"). Enabled by default.', ['--file-insertion-enabled'], - {'action': 'store_true', 'dest': 'file_insertion_enabled'}), + {'action': 'store_true'}), ('Disable the "raw" directives; replaced with a "warning" ' 'system message.', ['--no-raw'], - {'action': 'store_false', 'default': 1, 'dest': 'raw_enabled'}), + {'action': 'store_false', 'default': 1, 'dest': 'raw_enabled', + 'validator': frontend.validate_boolean}), ('Enable the "raw" directive. Enabled by default.', ['--raw-enabled'], - {'action': 'store_true', 'dest': 'raw_enabled'}),)) + {'action': 'store_true'}),)) config_section = 'restructuredtext parser' config_section_dependencies = ('parsers',) Modified: branches/docutils-0.4/docutils/readers/standalone.py =================================================================== --- branches/docutils-0.4/docutils/readers/standalone.py 2006-11-13 05:57:21 UTC (rev 4814) +++ branches/docutils-0.4/docutils/readers/standalone.py 2006-11-13 06:07:13 UTC (rev 4815) @@ -45,8 +45,7 @@ 'validator': frontend.validate_boolean}), ('Deactivate the promotion of lone subsection titles.', ['--no-section-subtitles'], - {'dest': 'sectsubtitle_xform', 'action': 'store_false', - 'validator': frontend.validate_boolean}), + {'dest': 'sectsubtitle_xform', 'action': 'store_false'}), )) config_section = 'standalone reader' Modified: branches/docutils-0.4/docutils/writers/html4css1/__init__.py =================================================================== --- branches/docutils-0.4/docutils/writers/html4css1/__init__.py 2006-11-13 05:57:21 UTC (rev 4814) +++ branches/docutils-0.4/docutils/writers/html4css1/__init__.py 2006-11-13 06:07:13 UTC (rev 4815) @@ -64,8 +64,7 @@ ('Link to the stylesheet in the output HTML file. Default: ' 'embed the stylesheet, do not link to it.', ['--link-stylesheet'], - {'dest': 'embed_stylesheet', 'action': 'store_false', - 'validator': frontend.validate_boolean}), + {'dest': 'embed_stylesheet', 'action': 'store_false'}), ('Specify the initial header level. Default is 1 for "<h1>". ' 'Does not affect document title & subtitle (see --no-doc-title).', ['--initial-header-level'], Modified: branches/docutils-0.4/docutils/writers/s5_html/__init__.py =================================================================== --- branches/docutils-0.4/docutils/writers/s5_html/__init__.py 2006-11-13 05:57:21 UTC (rev 4814) +++ branches/docutils-0.4/docutils/writers/s5_html/__init__.py 2006-11-13 06:07:13 UTC (rev 4815) @@ -57,7 +57,7 @@ ('Allow existing theme files in the ``ui/<theme>`` directory to be ' 'overwritten. The default is not to overwrite theme files.', ['--overwrite-theme-files'], - {'action': 'store_true'}), + {'action': 'store_true', 'validator': frontend.validate_boolean}), ('Keep existing theme files in the ``ui/<theme>`` directory; do not ' 'overwrite any. This is the default.', ['--keep-theme-files'], @@ -65,7 +65,7 @@ ('Enable the current slide indicator ("1 / 15"). ' 'The default is to disable it.', ['--current-slide'], - {'action': 'store_true'}), + {'action': 'store_true', 'validator': frontend.validate_boolean}), ('Disable the current slide indicator. This is the default.', ['--no-current-slide'], {'dest': 'current_slide', 'action': 'store_false'}),)) Modified: branches/docutils-0.4/test/data/config_1.txt =================================================================== --- branches/docutils-0.4/test/data/config_1.txt 2006-11-13 05:57:21 UTC (rev 4814) +++ branches/docutils-0.4/test/data/config_1.txt 2006-11-13 06:07:13 UTC (rev 4815) @@ -5,8 +5,8 @@ source-link: on datestamp: %Y-%m-%d %H:%M UTC generator: true +raw-enabled: off - [restructuredtext parser] trim-footnote-reference-space: 1 Modified: branches/docutils-0.4/test/test_settings.py =================================================================== --- branches/docutils-0.4/test/test_settings.py 2006-11-13 05:57:21 UTC (rev 4814) +++ branches/docutils-0.4/test/test_settings.py 2006-11-13 06:07:13 UTC (rev 4815) @@ -52,6 +52,7 @@ 'generator': 1, 'no_random': 1, 'python_home': 'http://www.python.org', + 'raw_enabled': 0, 'record_dependencies': utils.DependencyList(), 'source_link': 1, 'stylesheet': None, |