Make the treewalkers work a bit

jgraham · jgraham · commit 625758021982 · 2009-06-15T20:32:47.000+02:00
diff --git a/src/html5lib/treewalkers/_base.py b/src/html5lib/treewalkers/_base.py
@@ -21,8 +21,9 @@ def normalizeAttrs(self, attrs):
             attrs = attrs.items()
         return [(unicode(name),unicode(value)) for name,value in attrs]
 
-    def emptyTag(self, name, attrs, hasChildren=False):
+    def emptyTag(self, namespace, name, attrs, hasChildren=False):
         yield {"type": "EmptyTag", "name": unicode(name), 
+               "namespace":unicode(namespace),
                "data": self.normalizeAttrs(attrs)}
         if hasChildren:
             yield self.error(_("Void element has children"))
@@ -36,7 +37,7 @@ def startTag(self, namespace, name, attrs):
     def endTag(self, namespace, name):
         return {"type": "EndTag", 
                 "name": unicode(name),
-                "namespace":unicode(namespace)
+                "namespace":unicode(namespace),
                 "data": []}
 
     def text(self, data):
@@ -150,7 +151,7 @@ def __iter__(self):
                     if type == ELEMENT:
                         namespace, name, attributes, hasChildren = details
                         if name not in voidElements:
-                            yield self.endTag(name)
+                            yield self.endTag(namespace, name)
                     nextSibling = self.getNextSibling(currentNode)
                     if nextSibling is not None:
                         currentNode = nextSibling
diff --git a/src/html5lib/treewalkers/lxmletree.py b/src/html5lib/treewalkers/lxmletree.py
@@ -1,4 +1,5 @@
 from lxml import etree
+from html5lib.treebuilders.etree import tag_regexp
 
 from gettext import gettext
 _ = gettext

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`from lxml import etree`
	`2`	`+from html5lib.treebuilders.etree import tag_regexp`
`2`	`3`
`3`	`4`	`from gettext import gettext`
`4`	`5`	`_ = gettext`