Various fixes. Python tests still fail.

rubys · rubys · commit 63e11654ffe5 · 2007-07-08T11:37:41.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40873
diff --git a/src/html5lib/treewalkers/_base.py b/src/html5lib/treewalkers/_base.py
@@ -52,7 +52,8 @@ def comment(self, data):
         return {"type": "Comment", "data": unicode(data)}
 
     def doctype(self, name):
-        return {"type": "Doctype", "name": unicode(name), "data": name.upper() == "HTML"}
+        return {"type": "Doctype", "name": unicode(name),
+                "data": name and name.upper() == "HTML"}
 
     def unknown(self, nodeType):
         return self.error(_("Unknown node type: ") + nodeType)
diff --git a/src/html5lib/treewalkers/dom.py b/src/html5lib/treewalkers/dom.py
@@ -10,7 +10,7 @@
 class TreeWalker(_base.NonRecursiveTreeWalker):
     def getNodeDetails(self, node):
         if node.nodeType == Node.DOCUMENT_TYPE_NODE:
-            return _base.DOCTYPE, node.nodeName
+            return _base.DOCTYPE, node.nodeName or ''
 
         elif node.nodeType in (Node.TEXT_NODE, Node.CDATA_SECTION_NODE):
             return _base.TEXT, node.nodeValue
diff --git a/tests/test_treewalkers.py b/tests/test_treewalkers.py
@@ -181,7 +181,10 @@ def convertTokens(tokens):
         elif type == "Comment":
             output.append("%s<!-- %s -->" % (" "*indent, token["data"]))
         elif type == "Doctype":
-            output.append("%s<!DOCTYPE %s>" % (" "*indent, token["name"]))
+            if token["name"]:
+                output.append("%s<!DOCTYPE %s>" % (" "*indent, token["name"]))
+            else:
+                output.append("%s<!DOCTYPE>" % " "*indent)
         elif type in ("Characters", "SpaceCharacters"):
             output.append("%s\"%s\"" % (" "*indent, token["data"]))
         else:
