Clean up test serialization of no-name doctype case

jgraham · jgraham · commit 36a90f546990 · 2007-07-07T13:09:06.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40870
diff --git a/src/html5lib/treebuilders/dom.py b/src/html5lib/treebuilders/dom.py
@@ -119,7 +119,10 @@ def testSerializer(element):
     rv = []
     def serializeElement(element, indent=0):
         if element.nodeType == Node.DOCUMENT_TYPE_NODE:
-            rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.name))
+            if element.name:
+                rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.name))
+            else:
+                rv.append("|%s<!DOCTYPE>"%(' '*indent))
         elif element.nodeType == Node.DOCUMENT_NODE:
             rv.append("#document")
         elif element.nodeType == Node.DOCUMENT_FRAGMENT_NODE:
diff --git a/src/html5lib/treebuilders/etree.py b/src/html5lib/treebuilders/etree.py
@@ -151,7 +151,10 @@ def serializeElement(element, indent=0):
             if not(hasattr(element, "tag")):
                 element = element.getroot()
             if element.tag == "<!DOCTYPE>":
-                rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.text))
+                if element.text:
+                    rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.text))
+                else:
+                    rv.append("|%s<!DOCTYPE>"%(' '*indent))
             elif element.tag == "<DOCUMENT_ROOT>":
                 rv.append("#document")
                 if element.text:
diff --git a/src/html5lib/treebuilders/simpletree.py b/src/html5lib/treebuilders/simpletree.py
@@ -109,7 +109,10 @@ def __init__(self, name):
         Node.__init__(self, name)
 
     def __unicode__(self):
-        return "<!DOCTYPE %s>" % self.name
+        if self.name:
+            return "<!DOCTYPE %s>" % self.name
+        else:
+            return "<!DOCTYPE>"
 
     toxml = __unicode__
     
diff --git a/src/html5lib/treebuilders/soup.py b/src/html5lib/treebuilders/soup.py
@@ -133,7 +133,10 @@ def testSerializer(element):
     rv = []
     def serializeElement(element, indent=0):
         if isinstance(element, Declaration):
-            rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.string))
+            if element.string:
+                rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.string))
+            else:
+                rv.append("|%s<!DOCTYPE>"%(' '*indent))
         elif isinstance(element, BeautifulSoup):
             if element.name == "[document_fragment]":
                 rv.append("#document-fragment")                
