Skip to content

Commit f4490be

Browse files
committed
Avoid running tests for cElementTree & ElementTree where they're the same.
1 parent 40d007a commit f4490be

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

html5lib/tests/support.py

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,17 @@
2121

2222
# Try whatever etree implementations are available from a list that are
2323
#"supposed" to work
24-
try:
25-
import xml.etree.ElementTree as ElementTree
26-
treeTypes['ElementTree'] = treebuilders.getTreeBuilder("etree", ElementTree, fullTree=True)
27-
except ImportError:
28-
try:
29-
import elementtree.ElementTree as ElementTree
30-
treeTypes['ElementTree'] = treebuilders.getTreeBuilder("etree", ElementTree, fullTree=True)
31-
except ImportError:
32-
pass
24+
import xml.etree.ElementTree as ElementTree
25+
treeTypes['ElementTree'] = treebuilders.getTreeBuilder("etree", ElementTree, fullTree=True)
3326

3427
try:
3528
import xml.etree.cElementTree as cElementTree
36-
treeTypes['cElementTree'] = treebuilders.getTreeBuilder("etree", cElementTree, fullTree=True)
3729
except ImportError:
38-
try:
39-
import cElementTree
30+
pass
31+
else:
32+
# On Python 3.3 and above cElementTree is an alias, don't run them twice.
33+
if cElementTree.Element is not ElementTree.Element:
4034
treeTypes['cElementTree'] = treebuilders.getTreeBuilder("etree", cElementTree, fullTree=True)
41-
except ImportError:
42-
pass
4335

4436
try:
4537
import lxml.etree as lxml # flake8: noqa

0 commit comments

Comments
 (0)