Some more elementtree fixes. Still fails whenever a doctype is encountered

jgraham · jgraham · commit 60b8c11d4a03 · 2006-12-31T00:20:18.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40392
diff --git a/src/parser.py b/src/parser.py
@@ -897,11 +897,12 @@ def endTagFormatting(self, name):
             clone = afeElement.cloneNode()
 
             # Step 10
-            clone.childNodes.extend(furthestBlock.childNodes)
+            for furthestBlockChild in furthestBlock.childNodes:
+                clone.appendChild(furthestBlockChild)
             furthestBlock.childNodes = []
 
             # Step 11
-            furthestBlock.childNodes.append(clone)
+            furthestBlock.appendChild(clone)
 
             # Step 12
             self.tree.activeFormattingElements.remove(afeElement)
diff --git a/src/treebuilders/DOMlite.py b/src/treebuilders/DOMlite.py
@@ -120,4 +120,4 @@ class TreeBuilder(base.TreeBuilder):
     commentClass = CommentNode
     
     def testSerializer(self, node):
-        node.printTree()
+        return node.printTree()
diff --git a/src/treebuilders/etree.py b/src/treebuilders/etree.py
@@ -10,6 +10,7 @@ def __init__(self, name):
         self._element = ElementTree.Element(name)
         self.name = name
         self.parent = None
+        self._childNodes = []
         self._flags = []
 
         #Set the element text and tail to the empty string rather than None
@@ -38,7 +39,19 @@ def _setAttributes(self, attributes):
 
     attributes = property(_getAttributes, _setAttributes)
 
+    def _getChildNodes(self):
+        return self._childNodes
+
+    def _setChildNodes(self, value):
+        del self._element[:]
+        self._childNodes = []
+        for element in value:
+            self.insertChild(element)
+
+    childNodes = property(_getChildNodes, _setChildNodes)
+
     def appendChild(self, node):
+        self._childNodes.append(node)
         self._element.append(node._element)
         node.parent = self
 
@@ -64,7 +77,7 @@ def insertText(self, data, insertBefore=None):
             if index > 0:
                 self._element[index-1].tail += data
             else:
-                self.text += data
+                self._element.text += data
 
     def cloneNode(self):
         element = Element(self.name)
@@ -88,14 +101,13 @@ def _setData(self, value):
 class DocumentType(Element):
     def __init__(self, name):
         self._element = ElementTree.Element(DocumentType)
-        self.text = "html"
+        self._element.text = "html"
 
 class Document(Element):
     def __init__(self):
         Element.__init__(self, "")
 
 def testSerializer(element):
-    print type(ElementTree.Comment)
     rv = []
     rv.append("#document")
     def serializeElement(element, indent=0):
@@ -115,7 +127,7 @@ def serializeElement(element, indent=0):
             serializeElement(child, indent)
         if element.tail:
             rv.append("|%s\"%s\"" %(' '*(indent-2), element.tail))
-    serializeElement(element)
+    serializeElement(element, 2)
     return "\n".join(rv)
 
 class TreeBuilder(base.TreeBuilder):
