Elementtree now passes all tests! Added hasContent method on the tree node interface so that we can check for either real element/comment children or text in the element and altered the serializer to put in text before and after the html element

jgraham · jgraham · commit 9f9b8d0e24fe · 2007-01-02T13:21:33.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40399
diff --git a/src/parser.py b/src/parser.py
@@ -880,7 +880,8 @@ def endTagFormatting(self, name):
                     bookmark = self.tree.activeFormattingElements.\
                       index(node) + 1
                 # Step 7.5
-                if node.childNodes:
+                cite = node.parent
+                if node.hasContent():
                     clone = node.cloneNode()
                     # Replace node with clone
                     self.tree.activeFormattingElements[
diff --git a/src/treebuilders/DOMlite.py b/src/treebuilders/DOMlite.py
@@ -59,6 +59,10 @@ def cloneNode(self):
         newNode.value = self.value
         return newNode
 
+    def hasContent(self):
+        """Return true if the node has children or text"""
+        return bool(self.childNodes)
+
 class Document(Node):
     def __init__(self):
         Node.__init__(self, None)
diff --git a/src/treebuilders/etree.py b/src/treebuilders/etree.py
@@ -18,6 +18,9 @@ def __init__(self, name):
         self._element.text = ""
         self._element.tail = ""
 
+    def __repr__(self):
+        return "<%s %s>" % (self.__class__, self.name)
+
     def _setName(self, name):
         self._element.tag = name
     
@@ -50,6 +53,10 @@ def _setChildNodes(self, value):
 
     childNodes = property(_getChildNodes, _setChildNodes)
 
+    def hasContent(self):
+        """Return true if the node has children or text"""
+        return bool(self._element.text or self._element.getchildren())
+
     def appendChild(self, node):
         self._childNodes.append(node)
         self._element.append(node._element)
@@ -108,11 +115,16 @@ def __init__(self):
 
 def testSerializer(element):
     rv = []
+    finalText = None
     def serializeElement(element, indent=0):
         if element.tag is DocumentType:
             rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.text))
         elif element.tag is Document:
             rv.append("#document")
+            if element.text:
+                rv.append("|%s\"%s\""%(' '*(indent+2), element.text))
+            if element.tail:
+                finalText = element.tail
         elif element.tag is Comment:
             rv.append("|%s<!-- %s -->"%(' '*indent, element.text))
         else:
@@ -128,6 +140,10 @@ def serializeElement(element, indent=0):
         if element.tail:
             rv.append("|%s\"%s\"" %(' '*(indent-2), element.tail))
     serializeElement(element, 0)
+
+    if finalText is not None:
+        rv.append("|%s\"%s\""%(' '*2, finalText))
+
     return "\n".join(rv)
 
 class TreeBuilder(base.TreeBuilder):
