Fix test output for missing public or system id

jgraham · jgraham · commit 61c7700dec3c · 2009-09-26T21:56:07.000+02:00
diff --git a/src/html5lib/treewalkers/_base.py b/src/html5lib/treewalkers/_base.py
@@ -60,7 +60,8 @@ def comment(self, data):
     def doctype(self, name, publicId=None, systemId=None, correct=True):
         return {"type": "Doctype",
                 "name": name is not None and unicode(name) or u"",
-                "publicId": publicId, "systemId": systemId,
+                "publicId": publicId,
+                "systemId": systemId,
                 "correct": correct}
 
     def unknown(self, nodeType):
diff --git a/tests/test_treewalkers.py b/tests/test_treewalkers.py
@@ -196,10 +196,14 @@ def convertTokens(tokens):
             output.append("%s<!-- %s -->" % (" "*indent, token["data"]))
         elif type == "Doctype":
             if token["name"]:
-                if token["publicId"] or token["systemId"]:
+                if token["publicId"]:
                     output.append("""%s<!DOCTYPE %s "%s" "%s">"""% 
                                   (" "*indent, token["name"], 
                                    token["publicId"],
+                                   token["systemId"] and token["systemId"] or ""))
+                elif token["systemId"]:
+                    output.append("""%s<!DOCTYPE %s SYSTEM "%s">"""% 
+                                  (" "*indent, token["name"], 
                                    token["systemId"]))
                 else:
                     output.append("%s<!DOCTYPE %s>"%(" "*indent,
