mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
* gettext does not extract nodes.line in a table or list. Closes #1477
This commit is contained in:
parent
c4c126edd8
commit
8f7936d75c
1
CHANGES
1
CHANGES
@ -38,6 +38,7 @@ Bugs fixed
|
|||||||
inheritance-diagram directive. Thanks to WAKAYAMA shirou.
|
inheritance-diagram directive. Thanks to WAKAYAMA shirou.
|
||||||
* PR#281, PR#282, #1509: TODO extension not compatible with websupport. Thanks
|
* PR#281, PR#282, #1509: TODO extension not compatible with websupport. Thanks
|
||||||
to Takeshi Komiya.
|
to Takeshi Komiya.
|
||||||
|
* #1477: gettext does not extract nodes.line in a table or list.
|
||||||
|
|
||||||
Release 1.2.2 (released Mar 2, 2014)
|
Release 1.2.2 (released Mar 2, 2014)
|
||||||
====================================
|
====================================
|
||||||
|
@ -59,6 +59,7 @@ def apply_source_workaround(node):
|
|||||||
nodes.caption,
|
nodes.caption,
|
||||||
nodes.title,
|
nodes.title,
|
||||||
nodes.rubric,
|
nodes.rubric,
|
||||||
|
nodes.line,
|
||||||
))):
|
))):
|
||||||
node.source = find_source_node(node)
|
node.source = find_source_node(node)
|
||||||
node.line = 0 # need fix docutils to get `node.line`
|
node.line = 0 # need fix docutils to get `node.line`
|
||||||
|
121
tests/test_util_nodes.py
Normal file
121
tests/test_util_nodes.py
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
test_util_nodes
|
||||||
|
~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Tests uti.nodes functions.
|
||||||
|
|
||||||
|
:copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
|
||||||
|
:license: BSD, see LICENSE for details.
|
||||||
|
"""
|
||||||
|
from textwrap import dedent
|
||||||
|
|
||||||
|
from docutils import nodes
|
||||||
|
from docutils.parsers import rst
|
||||||
|
from docutils.utils import new_document
|
||||||
|
from docutils import frontend
|
||||||
|
|
||||||
|
from sphinx.util.nodes import extract_messages
|
||||||
|
|
||||||
|
|
||||||
|
def _get_doctree(text):
|
||||||
|
settings = frontend.OptionParser(
|
||||||
|
components=(rst.Parser,)).get_default_values()
|
||||||
|
document = new_document('dummy.txt', settings)
|
||||||
|
rst.Parser().parse(text, document)
|
||||||
|
return document
|
||||||
|
|
||||||
|
|
||||||
|
def assert_node_count(messages, node_type, expect_count):
|
||||||
|
count = 0
|
||||||
|
node_list = [node for node, msg in messages]
|
||||||
|
for node in node_list:
|
||||||
|
if isinstance(node, node_type):
|
||||||
|
count += 1
|
||||||
|
|
||||||
|
assert count == expect_count, (
|
||||||
|
"Count of %r in the %r is %d instead of %d"
|
||||||
|
% (node_type, node_list, count, expect_count))
|
||||||
|
|
||||||
|
|
||||||
|
def test_extract_messages():
|
||||||
|
text = dedent(
|
||||||
|
"""
|
||||||
|
.. admonition:: admonition title
|
||||||
|
|
||||||
|
admonition body
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
yield (
|
||||||
|
assert_node_count,
|
||||||
|
extract_messages(_get_doctree(text)),
|
||||||
|
nodes.title, 1,
|
||||||
|
)
|
||||||
|
|
||||||
|
text = dedent(
|
||||||
|
"""
|
||||||
|
.. figure:: foo.jpg
|
||||||
|
|
||||||
|
this is title
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
yield (
|
||||||
|
assert_node_count,
|
||||||
|
extract_messages(_get_doctree(text)),
|
||||||
|
nodes.caption, 1,
|
||||||
|
)
|
||||||
|
|
||||||
|
text = dedent(
|
||||||
|
"""
|
||||||
|
.. rubric:: spam
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
yield (
|
||||||
|
assert_node_count,
|
||||||
|
extract_messages(_get_doctree(text)),
|
||||||
|
nodes.rubric, 1,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
text = dedent(
|
||||||
|
"""
|
||||||
|
| spam
|
||||||
|
| egg
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
yield (
|
||||||
|
assert_node_count,
|
||||||
|
extract_messages(_get_doctree(text)),
|
||||||
|
nodes.line, 2,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
text = dedent(
|
||||||
|
"""
|
||||||
|
section
|
||||||
|
=======
|
||||||
|
|
||||||
|
+----------------+
|
||||||
|
| | **Title 1** |
|
||||||
|
| | Message 1 |
|
||||||
|
+----------------+
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
yield (
|
||||||
|
assert_node_count,
|
||||||
|
extract_messages(_get_doctree(text)),
|
||||||
|
nodes.line, 2,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
text = dedent(
|
||||||
|
"""
|
||||||
|
* | **Title 1**
|
||||||
|
| Message 1
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
yield (
|
||||||
|
assert_node_count,
|
||||||
|
extract_messages(_get_doctree(text)),
|
||||||
|
nodes.line, 2,
|
||||||
|
)
|
Loading…
Reference in New Issue
Block a user