Move default_etree to utils.py and use it for the treewalker too.

gsnedders · gsnedders · commit a4fc4d88a8fb · 2013-05-17T12:53:50.000+01:00
diff --git a/html5lib/treebuilders/__init__.py b/html5lib/treebuilders/__init__.py
@@ -28,6 +28,8 @@
 
 from __future__ import absolute_import, division, unicode_literals
 
+from ..utils import default_etree
+
 treeBuilderCache = {}
 
 
@@ -64,14 +66,9 @@ def getTreeBuilder(treeType, implementation=None, **kwargs):
             from . import etree_lxml
             treeBuilderCache[treeType] = etree_lxml.TreeBuilder
         elif treeType == "etree":
-            # Come up with a sane default (pref. from the stdlib)
-            if implementation is None:
-                try:
-                    import xml.etree.cElementTree as ET
-                except ImportError:
-                    import xml.etree.ElementTree as ET
-                implementation = ET
             from . import etree
+            if implementation is None:
+                implementation = default_etree
             # NEVER cache here, caching is done in the etree submodule
             return etree.getETreeModule(implementation, **kwargs).TreeBuilder
         else:
diff --git a/html5lib/treewalkers/__init__.py b/html5lib/treewalkers/__init__.py
@@ -12,6 +12,8 @@
 
 import sys
 
+from ..utils import default_etree
+
 treeWalkerCache = {}
 
 
@@ -48,6 +50,8 @@ def getTreeWalker(treeType, implementation=None, **kwargs):
             treeWalkerCache[treeType] = lxmletree.TreeWalker
         elif treeType == "etree":
             from . import etree
+            if implementation is None:
+                implementation = default_etree
             # XXX: NEVER cache here, caching is done in the etree submodule
             return etree.getETreeModule(implementation, **kwargs).TreeWalker
     return treeWalkerCache.get(treeType)
diff --git a/html5lib/utils.py b/html5lib/utils.py
@@ -2,6 +2,11 @@
 
 from types import ModuleType
 
+try:
+    import xml.etree.cElementTree as default_etree
+except ImportError:
+    import xml.etree.ElementTree as default_etree
+
 
 class MethodDispatcher(dict):
     """Dict with 2 special properties:
