The elementtree fixes I wanted to check in before

jgraham · jgraham · commit 75357775abe4 · 2007-01-01T19:37:51.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40396
diff --git a/src/treebuilders/etree.py b/src/treebuilders/etree.py
@@ -100,19 +100,20 @@ def _setData(self, value):
 
 class DocumentType(Element):
     def __init__(self, name):
-        self._element = ElementTree.Element(DocumentType)
-        self._element.text = "html"
+        Element.__init__(self, DocumentType) 
+        self._element.text = name
 
 class Document(Element):
     def __init__(self):
-        Element.__init__(self, "")
+        Element.__init__(self, Document) 
 
 def testSerializer(element):
     rv = []
-    rv.append("#document")
     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")
         elif element.tag is ElementTree.Comment:
             rv.append("|%s<!-- %s -->"%(' '*indent, element.text))
         else:
@@ -127,7 +128,7 @@ def serializeElement(element, indent=0):
             serializeElement(child, indent)
         if element.tail:
             rv.append("|%s\"%s\"" %(' '*(indent-2), element.tail))
-    serializeElement(element, 2)
+    serializeElement(element, 0)
     return "\n".join(rv)
 
 class TreeBuilder(base.TreeBuilder):
@@ -140,4 +141,4 @@ def testSerializer(self, element):
         return testSerializer(element)
 
     def getDocument(self):
-        return self.document._element.getchildren()[0]
+        return self.document._element
