From 353e992b37f5e777402d0ac3780f1fae47a2fb7b Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sat, 26 Jan 2019 16:45:50 +0900 Subject: [PATCH] refactor: test_build_html.py --- tests/test_build_html.py | 8 ++------ tests/test_build_html5.py | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/test_build_html.py b/tests/test_build_html.py index 70fc2e32b..4fb985fba 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py @@ -10,20 +10,16 @@ import os import re -import xml.etree.cElementTree as ElementTree from itertools import cycle, chain import pytest -from html5lib import getTreeBuilder, HTMLParser +from html5lib import HTMLParser from sphinx.errors import ConfigError from sphinx.testing.util import strip_escseq from sphinx.util.inventory import InventoryFile -TREE_BUILDER = getTreeBuilder('etree', implementation=ElementTree) -HTML_PARSER = HTMLParser(TREE_BUILDER, namespaceHTMLElements=False) - ENV_WARNINGS = """\ %(root)s/autodoc_fodder.py:docstring of autodoc_fodder.MarkupError:\\d+: \ WARNING: Explicit markup ends without a blank line; unexpected unindent. @@ -53,7 +49,7 @@ def cached_etree_parse(): if fname in etree_cache: return etree_cache[fname] with (fname).open('rb') as fp: - etree = HTML_PARSER.parse(fp) + etree = HTMLParser(namespaceHTMLElements=False).parse(fp) etree_cache.clear() etree_cache[fname] = etree return etree diff --git a/tests/test_build_html5.py b/tests/test_build_html5.py index 9c4cdc8a6..dcf0ffcdd 100644 --- a/tests/test_build_html5.py +++ b/tests/test_build_html5.py @@ -14,18 +14,14 @@ """ import re -import xml.etree.cElementTree as ElementTree from hashlib import md5 import pytest -from html5lib import getTreeBuilder, HTMLParser +from html5lib import HTMLParser from test_build_html import flat_dict, tail_check, check_xpath from sphinx.util.docutils import is_html5_writer_available -TREE_BUILDER = getTreeBuilder('etree', implementation=ElementTree) -HTML_PARSER = HTMLParser(TREE_BUILDER, namespaceHTMLElements=False) - etree_cache = {} @@ -37,7 +33,7 @@ def cached_etree_parse(): if fname in etree_cache: return etree_cache[fname] with (fname).open('rb') as fp: - etree = HTML_PARSER.parse(fp) + etree = HTMLParser(namespaceHTMLElements=False).parse(fp) etree_cache.clear() etree_cache[fname] = etree return etree