Avoid running tests for cElementTree & ElementTree where they're the …

…same.
Sid532001 · Dec 3, 2015 · f4490be · f4490be
1 parent 40d007a
commit f4490be
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/html5lib/tests/support.py b/html5lib/tests/support.py
@@ -21,25 +21,17 @@
 
 # Try whatever etree implementations are available from a list that are
 #"supposed" to work
-try:
- import xml.etree.ElementTree as ElementTree
- treeTypes['ElementTree'] = treebuilders.getTreeBuilder("etree", ElementTree, fullTree=True)
-except ImportError:
- try:
- import elementtree.ElementTree as ElementTree
- treeTypes['ElementTree'] = treebuilders.getTreeBuilder("etree", ElementTree, fullTree=True)
- except ImportError:
- pass
+import xml.etree.ElementTree as ElementTree
+treeTypes['ElementTree'] = treebuilders.getTreeBuilder("etree", ElementTree, fullTree=True)
 
 try:
  import xml.etree.cElementTree as cElementTree
- treeTypes['cElementTree'] = treebuilders.getTreeBuilder("etree", cElementTree, fullTree=True)
 except ImportError:
- try:
- import cElementTree
+ pass
+else:
+ # On Python 3.3 and above cElementTree is an alias, don't run them twice.
+ if cElementTree.Element is not ElementTree.Element:
  treeTypes['cElementTree'] = treebuilders.getTreeBuilder("etree", cElementTree, fullTree=True)
- except ImportError:
- pass
 
 try:
  import lxml.etree as lxml # flake8: noqa