IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

From version 1.5 to 1.6. Warnings wrapped with locale.

Browse Source
This commit is contained in:
Marco Buttu 2017-01-26 11:20:24 +01:00
parent b52118290f
commit 882bebf90a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -42,6 +42,7 @@ Features added
imported members.
* C++, add ``:tparam-line-spec:`` option to templated declarations.
When specified, each template parameter will be rendered on a separate line.
* #3303: Add ``:pyversion:`` option to the doctest directive.
Bugs fixed
----------
@ -73,8 +74,6 @@ Deprecated
Features added
--------------
* #3303: Added ``:pyversion:`` option to the doctest directive
Bugs fixed
----------

2
doc/ext/doctest.rst
View File

@ -84,7 +84,7 @@ a comma-separated list of group names.
comparison is performed by `distutils.version.LooseVersion
<https://www.python.org/dev/peps/pep-0386/#distutils>`__.
.. versionadded:: 1.5
.. versionadded:: 1.6
Note that like with standard doctests, you have to use ``<BLANKLINE>`` to
signal a blank line in the expected output. The ``<BLANKLINE>`` is removed

11
sphinx/ext/doctest.py
View File

@ -31,6 +31,7 @@ from sphinx.util import force_decode, logging
from sphinx.util.nodes import set_source_info
from sphinx.util.console import bold # type: ignore
from sphinx.util.osutil import fs_encoding
from sphinx.locale import _
if False:
# For type annotation
@ -126,15 +127,15 @@ class TestDirective(Directive):
# parse doctest-like output comparison flags
option_strings = self.options['options'].replace(',', ' ').split()
for option in option_strings:
on_or_off, option_name = option[0], option[1:]
if on_or_off not in '+-': # type: ignore
prefix, option_name = option[0], option[1:]
if prefix not in '+-': # type: ignore
self.state.document.reporter.warning(
"missing '+' or '-' in '%s' option." % option,
_("missing '+' or '-' in '%s' option.") % option,
line=self.lineno)
continue
if option_name not in doctest.OPTIONFLAGS_BY_NAME: # type: ignore
self.state.document.reporter.warning(
"'%s' is not a valid option." % option_name,
_("'%s' is not a valid option.") % option_name,
line=self.lineno)
continue
flag = doctest.OPTIONFLAGS_BY_NAME[option[1:]] # type: ignore
@ -150,7 +151,7 @@ class TestDirective(Directive):
node['options'][flag] = True # Skip the test
except ValueError:
self.state.document.reporter.warning(
"'%s' is not a valid pyversion option" % option,
_("'%s' is not a valid pyversion option") % option,
line=self.lineno)
return [node]