diff options
| author | goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2005-06-01 13:52:43 +0000 |
|---|---|---|
| committer | goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2005-06-01 13:52:43 +0000 |
| commit | 3c046dc2d94f7fe02c438e00f540146802ab97e7 (patch) | |
| tree | b33f17d9baa5606562685712f2500115c8d0d68c /docutils | |
| parent | 885eeccaf66755de7fb30d433c901bb291a4292b (diff) | |
| download | docutils-3c046dc2d94f7fe02c438e00f540146802ab97e7.tar.gz | |
Added validator to tab_width setting, with test. Closes SF bug #1212515, report from Wu Wei.
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@3416 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'docutils')
| -rw-r--r-- | docutils/HISTORY.txt | 5 | ||||
| -rw-r--r-- | docutils/THANKS.txt | 1 | ||||
| -rw-r--r-- | docutils/docutils/parsers/rst/__init__.py | 3 | ||||
| -rw-r--r-- | docutils/test/data/config_1.txt | 1 | ||||
| -rwxr-xr-x | docutils/test/test_settings.py | 1 |
5 files changed, 10 insertions, 1 deletions
diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt index f5a6e653d..3e6282d19 100644 --- a/docutils/HISTORY.txt +++ b/docutils/HISTORY.txt @@ -14,6 +14,11 @@ Changes Since 0.3.9 =================== +* docutils/parsers/rst/__init__.py: + + - Added validator to tab_width setting, with test. Closes SF bug + #1212515, report from Wu Wei. + Release 0.3.9 (2005-05-26) ========================== diff --git a/docutils/THANKS.txt b/docutils/THANKS.txt index 26b6e9114..9dd6015f2 100644 --- a/docutils/THANKS.txt +++ b/docutils/THANKS.txt @@ -130,6 +130,7 @@ donations, tasty treats, and related projects: * Martin von Loewis * Greg Ward * Barry Warsaw +* Wu Wei * Edward Welbourne * Felix Wiemann * Ka-Ping Yee diff --git a/docutils/docutils/parsers/rst/__init__.py b/docutils/docutils/parsers/rst/__init__.py index 30825d7c4..ff1d7b4f8 100644 --- a/docutils/docutils/parsers/rst/__init__.py +++ b/docutils/docutils/parsers/rst/__init__.py @@ -105,7 +105,8 @@ class Parser(docutils.parsers.Parser): 'validator': frontend.validate_url_trailing_slash}), ('Set number of spaces for tab expansion (default 8).', ['--tab-width'], - {'metavar': '<width>', 'type': 'int', 'default': 8}), + {'metavar': '<width>', 'type': 'int', 'default': 8, + 'validator': frontend.validate_nonnegative_int}), ('Remove spaces before footnote references.', ['--trim-footnote-reference-space'], {'action': 'store_true', 'validator': frontend.validate_boolean}), diff --git a/docutils/test/data/config_1.txt b/docutils/test/data/config_1.txt index f94074a8a..b19a213b3 100644 --- a/docutils/test/data/config_1.txt +++ b/docutils/test/data/config_1.txt @@ -10,6 +10,7 @@ generator: true [restructuredtext parser] trim-footnote-reference-space: 1 +tab-width = 8 [html4css1 writer] diff --git a/docutils/test/test_settings.py b/docutils/test/test_settings.py index 2a17c6eef..4226af580 100755 --- a/docutils/test/test_settings.py +++ b/docutils/test/test_settings.py @@ -57,6 +57,7 @@ class ConfigFileTests(unittest.TestCase): 'source_link': 1, 'stylesheet': None, 'stylesheet_path': fixpath('data/stylesheets/pep.css'), + 'tab_width': 8, 'template': fixpath('data/pep-html-template'), 'trim_footnote_reference_space': 1}, 'two': {'footnote_references': 'superscript', |