mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Fix #10318: literalinclude: :prepend: option working with :dedent:
It will always be warned because prepending is processed before dedenting. This changes the order of processing options.
This commit is contained in:
parent
9141464b8b
commit
e571479d54
2
CHANGES
2
CHANGES
@ -72,6 +72,8 @@ Bugs fixed
|
|||||||
bulding texinfo document
|
bulding texinfo document
|
||||||
* #10000: LaTeX: glossary terms with common definition are rendered with
|
* #10000: LaTeX: glossary terms with common definition are rendered with
|
||||||
too much vertical whitespace
|
too much vertical whitespace
|
||||||
|
* #10318: ``:prepend:`` option of :rst:dir:`literalinclude` directive does not
|
||||||
|
work with ``:dedent:`` option
|
||||||
|
|
||||||
Testing
|
Testing
|
||||||
--------
|
--------
|
||||||
|
@ -224,9 +224,9 @@ class LiteralIncludeReader:
|
|||||||
self.start_filter,
|
self.start_filter,
|
||||||
self.end_filter,
|
self.end_filter,
|
||||||
self.lines_filter,
|
self.lines_filter,
|
||||||
|
self.dedent_filter,
|
||||||
self.prepend_filter,
|
self.prepend_filter,
|
||||||
self.append_filter,
|
self.append_filter]
|
||||||
self.dedent_filter]
|
|
||||||
lines = self.read_file(self.filename, location=location)
|
lines = self.read_file(self.filename, location=location)
|
||||||
for func in filters:
|
for func in filters:
|
||||||
lines = func(lines, location=location)
|
lines = func(lines, location=location)
|
||||||
|
@ -251,6 +251,19 @@ def test_LiteralIncludeReader_dedent(literal_inc_path):
|
|||||||
"\n")
|
"\n")
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.xfail(os.name != 'posix', reason="Not working on windows")
|
||||||
|
def test_LiteralIncludeReader_dedent_and_append_and_prepend(literal_inc_path):
|
||||||
|
# dedent: 2
|
||||||
|
options = {'lines': '9-11', 'dedent': 2, 'prepend': 'class Foo:', 'append': '# comment'}
|
||||||
|
reader = LiteralIncludeReader(literal_inc_path, options, DUMMY_CONFIG)
|
||||||
|
content, lines = reader.read()
|
||||||
|
assert content == ("class Foo:\n"
|
||||||
|
" def baz():\n"
|
||||||
|
" pass\n"
|
||||||
|
"\n"
|
||||||
|
"# comment\n")
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.xfail(os.name != 'posix', reason="Not working on windows")
|
@pytest.mark.xfail(os.name != 'posix', reason="Not working on windows")
|
||||||
def test_LiteralIncludeReader_tabwidth(testroot):
|
def test_LiteralIncludeReader_tabwidth(testroot):
|
||||||
# tab-width: 4
|
# tab-width: 4
|
||||||
|
Loading…
Reference in New Issue
Block a user