Create reparentChildren method, needed for elementtree; elementtree now passes all but two tests

jgraham · jgraham · commit 497e52706e0a · 2007-01-01T23:34:24.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40398
diff --git a/src/parser.py b/src/parser.py
@@ -906,9 +906,7 @@ def endTagFormatting(self, name):
             clone = afeElement.cloneNode()
 
             # Step 10
-            for furthestBlockChild in furthestBlock.childNodes:
-                clone.appendChild(furthestBlockChild)
-            furthestBlock.childNodes = []
+            self.tree.reparentChildren(furthestBlock, clone)
 
             # Step 11
             furthestBlock.appendChild(clone)
diff --git a/src/treebuilders/base.py b/src/treebuilders/base.py
@@ -231,6 +231,15 @@ def generateImpliedEndTags(self, exclude=None):
             # self.processEndTag(name)
             self.generateImpliedEndTags(exclude)
 
+    def reparentChildren(self, oldParent, newParent):
+        """Move all the children of oldParent to newParent. This is needed do 
+        that trees that don't store text as nodes move the text in the correct 
+        way"""
+        #XXX - should this method be made more general?
+        for child in oldParent.childNodes:
+            newParent.appendChild(child)
+        oldParent.childNodes = []
+
     def getDocument(self):
         "Return the final tree"
         return self.document
diff --git a/src/treebuilders/etree.py b/src/treebuilders/etree.py
@@ -86,9 +86,8 @@ def cloneNode(self):
 
 class Comment(Element):
     def __init__(self, data):
-        self._element = ElementTree.Comment(data)
-        self.name = None
-        self.parent = None
+        Element.__init__(self, Comment)
+        self._element.text = data
 
     def _getData(self):
         return self._element.text
@@ -114,7 +113,7 @@ def serializeElement(element, indent=0):
             rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.text))
         elif element.tag is Document:
             rv.append("#document")
-        elif element.tag is ElementTree.Comment:
+        elif element.tag is Comment:
             rv.append("|%s<!-- %s -->"%(' '*indent, element.text))
         else:
             rv.append("|%s<%s>"%(' '*indent, element.tag))
@@ -142,3 +141,11 @@ def testSerializer(self, element):
 
     def getDocument(self):
         return self.document._element
+    
+    def reparentChildren(self, oldParent, newParent):
+        if newParent.childNodes:
+            newParent.childNodes[-1]._element.tail += oldParent._element.text
+        else:
+            newParent._element.text += oldParent._element.text
+        oldParent._element.text = ""
+        base.TreeBuilder.reparentChildren(self, oldParent, newParent)
