Fix handling of doctype with no name in tests. Only formfiller filter tests still fail.

jgraham · jgraham · commit 2cee8fd5b693 · 2007-07-30T21:19:30.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40922
diff --git a/src/html5lib/inputstream.py b/src/html5lib/inputstream.py
@@ -255,7 +255,7 @@ def charsUntil(self, characters, opposite = False):
         #optimizing
         #Possible improvements:
         # - use regexp to find characters that match the required character set
-        #   (with regexp cache since we do the same operations many many times)
+        #   (with regexp cache since we do the same searches many many times)
         # - improve EOF handling for fewer if statements
 
         if not self.queue:
diff --git a/src/html5lib/treebuilders/dom.py b/src/html5lib/treebuilders/dom.py
@@ -122,7 +122,7 @@ def serializeElement(element, indent=0):
             if element.name:
                 rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.name))
             else:
-                rv.append("|%s<!DOCTYPE>"%(' '*indent))
+                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
@@ -169,10 +169,7 @@ def serializeElement(element, indent=0):
             if not(hasattr(element, "tag")):
                 element = element.getroot()
             if element.tag == "<!DOCTYPE>":
-                if element.text:
-                    rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.text))
-                else:
-                    rv.append("|%s<!DOCTYPE>"%(' '*indent))
+                rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.text))
             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
@@ -112,10 +112,7 @@ def __init__(self, name):
         self.systemId = u""
 
     def __unicode__(self):
-        if self.name:
-            return u"<!DOCTYPE %s>" % self.name
-        else:
-            return u"<!DOCTYPE>"
+        return u"<!DOCTYPE %s>" % self.name
 
     toxml = __unicode__
     
diff --git a/src/html5lib/treebuilders/soup.py b/src/html5lib/treebuilders/soup.py
@@ -133,10 +133,7 @@ def testSerializer(element):
     rv = []
     def serializeElement(element, indent=0):
         if isinstance(element, Declaration):
-            if element.string:
-                rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.string))
-            else:
-                rv.append("|%s<!DOCTYPE>"%(' '*indent))
+            rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.string))
         elif isinstance(element, BeautifulSoup):
             if element.name == "[document_fragment]":
                 rv.append("#document-fragment")                
diff --git a/tests/test_treewalkers.py b/tests/test_treewalkers.py
@@ -184,7 +184,7 @@ def convertTokens(tokens):
             if token["name"]:
                 output.append("%s<!DOCTYPE %s>" % (" "*indent, token["name"]))
             else:
-                output.append("%s<!DOCTYPE>" % (" "*indent,))
+                output.append("%s<!DOCTYPE >" % (" "*indent,))
         elif type in ("Characters", "SpaceCharacters"):
             output.append("%s\"%s\"" % (" "*indent, token["data"]))
         else:
