More namespace support for genshi and pulldom treewalkers

jgraham · jgraham · commit bf4e0e05b525 · 2009-07-09T22:59:55.000+02:00
diff --git a/src/html5lib/treewalkers/genshistream.py b/src/html5lib/treewalkers/genshistream.py
@@ -11,9 +11,7 @@ def __iter__(self):
         depth = 0
         ignore_until = None
         previous = None
-        for event in NamespaceFlattener(prefixes={
-            'http://www.w3.org/1999/xhtml': ''
-          })(self.tree):
+        for event in self.tree:
             if previous is not None:
                 if previous[0] == START:
                     depth += 1
@@ -38,16 +36,21 @@ def tokens(self, event, next):
         kind, data, pos = event
         if kind == START:
             tag, attrib = data
+            name = tag.localname
+            namespace = tag.namespace
             if tag in voidElements:
-                for token in self.emptyTag(tag, list(attrib), \
-                  not next or next[0] != END or next[1] != tag):
+                for token in self.emptyTag(namespace, name, list(attrib),
+                                           not next or next[0] != END 
+                                           or next[1] != tag):
                     yield token
             else:
-                yield self.startTag(tag, list(attrib))
+                yield self.startTag(namespace, name, list(attrib))
 
         elif kind == END:
-            if data not in voidElements:
-                yield self.endTag(data)
+            name = data.localname
+            namespace = data.namespace
+            if (namespace, name) not in voidElements:
+                yield self.endTag(namespace, name)
 
         elif kind == COMMENT:
             yield self.comment(data)
diff --git a/src/html5lib/treewalkers/pulldom.py b/src/html5lib/treewalkers/pulldom.py
@@ -30,16 +30,18 @@ def tokens(self, event, next):
         if type == START_ELEMENT:
             name = node.nodeName
             if name in voidElements:
-                for token in self.emptyTag(name, \
-                  node.attributes.items(), not next or next[1] is not node):
+                for token in self.emptyTag(node.namespace,
+                                           name,
+                                           node.attributes.items(), 
+                                           not next or next[1] is not node):
                     yield token
             else:
-                yield self.startTag(name, node.attributes.items())
+                yield self.startTag(node.namespace, name, node.attributes.items())
 
         elif type == END_ELEMENT:
             name = node.nodeName
             if name not in voidElements:
-                yield self.endTag(name)
+                yield self.endTag(node.namespace, name)
 
         elif type == COMMENT:
             yield self.comment(node.nodeValue)
