Fixed bug in the PullDOM treewalker (found by reading the code, as there are no unit tests with void elements having children)

tbroyer · tbroyer · commit f1b39f77ffe3 · 2007-06-05T15:48:41.000Z
Removed the walk() method from _base.TreeWalker

--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40664
diff --git a/src/treewalkers/_base.py b/src/treewalkers/_base.py
@@ -11,8 +11,6 @@ def __init__(self, tree):
     def __iter__(self):
         raise NotImplementedError
 
-    walk = __iter__
-
     def error(self, msg):
         return {"type": "SerializeError", "data": msg}
 
diff --git a/src/treewalkers/pulldom.py b/src/treewalkers/pulldom.py
@@ -6,7 +6,7 @@
 from constants import voidElements
 
 class TreeWalker(_base.TreeWalker):
-    def walk(self):
+    def __iter__(self):
         ignore_until = None
         previous = None
         for event in self.tree:
@@ -31,7 +31,7 @@ def tokens(self, event, next):
             name = node.nodeName
             if name in voidElements:
                 for token in self.emptyTag(name, \
-                  node.attributes.items(), not event or event[1] is not node):
+                  node.attributes.items(), not next or next[1] is not node):
                     yield token
             else:
                 yield self.startTag(name, node.attributes.items())
