Make TreeWalker iterable

rubys · rubys · commit d95af0a2da62 · 2007-05-29T20:53:21.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40633
diff --git a/src/treewalkers/_base.py b/src/treewalkers/_base.py
@@ -5,7 +5,14 @@
 spaceCharacters = u"".join(spaceCharacters)
 
 class TreeWalker(object):
-    def walk(self, node):
+    def __init__(self, tree):
+        self.tree = tree
+
+    def __iter__(self):
+        for node in self.walk():
+            yield node
+
+    def walk(self):
         raise NotImplementedError
 
     def error(self, msg):
@@ -90,8 +97,8 @@ def getNextSibling(self, node):
     def getParentNode(self, node):
         raise NotImplementedError
 
-    def walk(self, node):
-        currentNode = node
+    def walk(self):
+        currentNode = self.tree
         while currentNode is not None:
             details = self.getNodeDetails(currentNode)
             type, details = details[0], details[1:]
@@ -137,7 +144,7 @@ def walk(self, node):
                     if nextSibling is not None:
                         currentNode = nextSibling
                         break
-                    if node is currentNode:
+                    if self.tree is currentNode:
                         currentNode = None
                     else:
                         currentNode = self.getParentNode(currentNode)
diff --git a/src/treewalkers/pulldom.py b/src/treewalkers/pulldom.py
@@ -6,10 +6,10 @@
 from constants import voidElements
 
 class TreeWalker(_base.TreeWalker):
-    def walk(self, stream):
+    def walk(self):
         ignore_until = None
         previous = None
-        for event in stream:
+        for event in self.tree:
             if previous is not None and \
               (ignore_until is None or previous[1] is ignore_until):
                 if previous[1] is ignore_until:
