From 4c67c110f65213161d6bdff8198ff19a7d74dc68 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Sat, 4 Mar 2017 20:32:46 -0600 Subject: [PATCH] Also change depart_admonition calls for html5 builder --- sphinx/writers/html5.py | 14 +++++++------- tests/test_build_html.py | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sphinx/writers/html5.py b/sphinx/writers/html5.py index bc9231b17..9deb35a88 100644 --- a/sphinx/writers/html5.py +++ b/sphinx/writers/html5.py @@ -679,7 +679,7 @@ class HTML5Translator(BaseTranslator): def depart_attention(self, node): # type: (nodes.Node) -> None - self.depart_admonition() + self.depart_admonition(node) def visit_caution(self, node): # type: (nodes.Node) -> None @@ -687,7 +687,7 @@ class HTML5Translator(BaseTranslator): def depart_caution(self, node): # type: (nodes.Node) -> None - self.depart_admonition() + self.depart_admonition(node) def visit_danger(self, node): # type: (nodes.Node) -> None @@ -695,7 +695,7 @@ class HTML5Translator(BaseTranslator): def depart_danger(self, node): # type: (nodes.Node) -> None - self.depart_admonition() + self.depart_admonition(node) def visit_error(self, node): # type: (nodes.Node) -> None @@ -703,7 +703,7 @@ class HTML5Translator(BaseTranslator): def depart_error(self, node): # type: (nodes.Node) -> None - self.depart_admonition() + self.depart_admonition(node) def visit_hint(self, node): # type: (nodes.Node) -> None @@ -711,7 +711,7 @@ class HTML5Translator(BaseTranslator): def depart_hint(self, node): # type: (nodes.Node) -> None - self.depart_admonition() + self.depart_admonition(node) def visit_important(self, node): # type: (nodes.Node) -> None @@ -719,7 +719,7 @@ class HTML5Translator(BaseTranslator): def depart_important(self, node): # type: (nodes.Node) -> None - self.depart_admonition() + self.depart_admonition(node) def visit_tip(self, node): # type: (nodes.Node) -> None @@ -727,7 +727,7 @@ class HTML5Translator(BaseTranslator): def depart_tip(self, node): # type: (nodes.Node) -> None - self.depart_admonition() + self.depart_admonition(node) # these are only handled specially in the SmartyPantsHTML5Translator def visit_literal_emphasis(self, node): diff --git a/tests/test_build_html.py b/tests/test_build_html.py index cc172ad1e..67939a10b 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py @@ -442,8 +442,7 @@ def test_html_output(app, cached_etree_parse, fname, expect): app.build() check_xpath(cached_etree_parse(app.outdir / fname), fname, *expect) -@pytest.mark.sphinx('html', testroot='build-html-translator', tags=['testtag'], confoverrides={ - 'html_context.hckey_co': 'hcval_co'}) +@pytest.mark.sphinx('html', testroot='build-html-translator') def test_html_translator(app): app.build() assert app.builder.docwriter.visitor.depart_with_node == 10