Update libs

libs/html5lib/treewalkers/etree.py

@@ -1,33 +1,28 @@
+from __future__ import absolute_import, division, unicode_literals
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    try:
+        from ordereddict import OrderedDict
+    except ImportError:
+        OrderedDict = dict
 import gettext
 _ = gettext.gettext
 
-try:
-    from types import ModuleType
-except:
-    from new import module as ModuleType
-import copy
 import re
 
-import _base
-from html5lib.constants import voidElements
+from six import text_type
+
+from . import _base
+from ..utils import moduleFactoryFactory
 
 tag_regexp = re.compile("{([^}]*)}(.*)")
 
-moduleCache = {}
-
-def getETreeModule(ElementTreeImplementation):
-    name = "_" + ElementTreeImplementation.__name__+"builder"
-    if name in moduleCache:
-        return moduleCache[name]
-    else:
-        mod = ModuleType("_" + ElementTreeImplementation.__name__+"builder")
-        objs = getETreeBuilder(ElementTreeImplementation)
-        mod.__dict__.update(objs)
-        moduleCache[name] = mod
-        return mod
 
 def getETreeBuilder(ElementTreeImplementation):
     ElementTree = ElementTreeImplementation
+    ElementTreeCommentType = ElementTree.Comment("asd").tag
 
     class TreeWalker(_base.NonRecursiveTreeWalker):
         """Given the particular ElementTree representation, this implementation,
@@ -35,16 +30,16 @@ def getETreeBuilder(ElementTreeImplementation):
         content:
 
         1. The current element
-        
+
         2. The index of the element relative to its parent
-        
+
         3. A stack of ancestor elements
-        
+
         4. A flag "text", "tail" or None to indicate if the current node is a
            text node; either the text or tail of the current element (1)
         """
         def getNodeDetails(self, node):
-            if isinstance(node, tuple): # It might be the root Element
+            if isinstance(node, tuple):  # It might be the root Element
                 elt, key, parents, flag = node
                 if flag in ("text", "tail"):
                     return _base.TEXT, getattr(elt, flag)
@@ -54,41 +49,41 @@ def getETreeBuilder(ElementTreeImplementation):
             if not(hasattr(node, "tag")):
                 node = node.getroot()
 
-            if node.tag in ("<DOCUMENT_ROOT>", "<DOCUMENT_FRAGMENT>"):
+            if node.tag in ("DOCUMENT_ROOT", "DOCUMENT_FRAGMENT"):
                 return (_base.DOCUMENT,)
 
             elif node.tag == "<!DOCTYPE>":
-                return (_base.DOCTYPE, node.text, 
+                return (_base.DOCTYPE, node.text,
                         node.get("publicId"), node.get("systemId"))
 
-            elif node.tag == ElementTree.Comment:
+            elif node.tag == ElementTreeCommentType:
                 return _base.COMMENT, node.text
 
             else:
-                assert type(node.tag) in (str, unicode), type(node.tag)
-                #This is assumed to be an ordinary element
+                assert type(node.tag) == text_type, type(node.tag)
+                # This is assumed to be an ordinary element
                 match = tag_regexp.match(node.tag)
                 if match:
                     namespace, tag = match.groups()
                 else:
                     namespace = None
                     tag = node.tag
-                attrs = {}
-                for name, value in node.attrib.items():
+                attrs = OrderedDict()
+                for name, value in list(node.attrib.items()):
                     match = tag_regexp.match(name)
                     if match:
-                        attrs[(match.group(1),match.group(2))] = value
+                        attrs[(match.group(1), match.group(2))] = value
                     else:
-                        attrs[(None,name)] = value
-                return (_base.ELEMENT, namespace, tag, 
+                        attrs[(None, name)] = value
+                return (_base.ELEMENT, namespace, tag,
                         attrs, len(node) or node.text)
-    
+
         def getFirstChild(self, node):
             if isinstance(node, tuple):
                 element, key, parents, flag = node
             else:
                 element, key, parents, flag = node, None, [], None
-                
+
             if flag in ("text", "tail"):
                 return None
             else:
@@ -99,13 +94,13 @@ def getETreeBuilder(ElementTreeImplementation):
                     return element[0], 0, parents, None
                 else:
                     return None
-        
+
         def getNextSibling(self, node):
             if isinstance(node, tuple):
                 element, key, parents, flag = node
             else:
                 return None
-                
+
             if flag == "text":
                 if len(element):
                     parents.append(element)
@@ -116,16 +111,16 @@ def getETreeBuilder(ElementTreeImplementation):
                 if element.tail and flag != "tail":
                     return element, key, parents, "tail"
                 elif key < len(parents[-1]) - 1:
-                    return parents[-1][key+1], key+1, parents, None
+                    return parents[-1][key + 1], key + 1, parents, None
                 else:
                     return None
-        
+
         def getParentNode(self, node):
             if isinstance(node, tuple):
                 element, key, parents, flag = node
             else:
                 return None
-            
+
             if flag == "text":
                 if not parents:
                     return element
@@ -139,3 +134,5 @@ def getETreeBuilder(ElementTreeImplementation):
                     return parent, list(parents[-1]).index(parent), parents, None
 
     return locals()
+
+getETreeModule = moduleFactoryFactory(getETreeBuilder)