Serialize system/public id in tests

jgraham · jgraham · commit d0d518630799 · 2008-03-18T20:10:14.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%401130
diff --git a/src/html5lib/treebuilders/dom.py b/src/html5lib/treebuilders/dom.py
@@ -138,7 +138,13 @@ def testSerializer(element):
         def serializeElement(element, indent=0):
             if element.nodeType == Node.DOCUMENT_TYPE_NODE:
                 if element.name:
-                    rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.name))
+                    if element.publicId or element.systemId:
+                        publicId = element.publicId or ""
+                        systemId = element.systemId or ""
+                        rv.append( """|%s<!DOCTYPE %s PUBLIC "%s" "%s">"""%(
+                                ' '*indent, element.name, publicId, systemId))
+                    else:
+                        rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.name))
                 else:
                     rv.append("|%s<!DOCTYPE >"%(' '*indent,))
             elif element.nodeType == Node.DOCUMENT_NODE:
diff --git a/src/html5lib/treebuilders/etree.py b/src/html5lib/treebuilders/etree.py
@@ -169,7 +169,13 @@ 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.get("publicId") or element.get("systemId"):
+                    publicId = element.get("publicId") or ""
+                    systemId = element.get("systemId") or ""
+                    rv.append( """<!DOCTYPE %s PUBLIC "%s" "%s">"""%(
+                            element.text, publicId, systemId))
+                else:     
+                    rv.append("<!DOCTYPE %s>"%(element.text,))
             elif element.tag == "<DOCUMENT_ROOT>":
                 rv.append("#document")
                 if element.text:
@@ -206,7 +212,13 @@ def serializeElement(element):
                 element = element.getroot()
             
             if element.tag == "<!DOCTYPE>":
-                rv.append("<!DOCTYPE %s>"%(element.text,))
+                if element.get("publicId") or element.get("systemId"):
+                    publicId = element.get("publicId") or ""
+                    systemId = element.get("systemId") or ""
+                    rv.append( """<!DOCTYPE %s PUBLIC "%s" "%s">"""%(
+                            element.text, publicId, systemId))
+                else:     
+                    rv.append("<!DOCTYPE %s>"%(element.text,))
             elif element.tag == "<DOCUMENT_ROOT>":
                 if element.text:
                     rv.append(element.text)
diff --git a/src/html5lib/treebuilders/simpletree.py b/src/html5lib/treebuilders/simpletree.py
@@ -112,7 +112,15 @@ def __init__(self, name):
         self.systemId = u""
 
     def __unicode__(self):
-        return u"<!DOCTYPE %s>" % self.name
+        if self.publicId or self.systemId:
+            publicId = self.publicId or ""
+            systemId = self.systemId or ""
+            return """<!DOCTYPE %s PUBLIC "%s" "%s">"""%(
+                self.name, publicId, systemId)
+                            
+        else:
+            return u"<!DOCTYPE %s>" % self.name
+    
 
     toxml = __unicode__
     
diff --git a/src/html5lib/treebuilders/soup.py b/src/html5lib/treebuilders/soup.py
@@ -104,7 +104,12 @@ def documentClass(self):
         return Element(self.soup, self.soup)
     
     def insertDoctype(self, name, publicId, systemId):
-        self.soup.insert(0, Declaration(name))
+        if publicId or systemId:
+            publicId = publicId or ""
+            systemId = systemId or ""
+            self.soup.insert(0, Declaration("%s PUBLIC \"%s\" \"%s\""%(name, publicId, systemId)))
+        else:
+            self.soup.insert(0, Declaration(name))
     
     def elementClass(self, name):
         return Element(Tag(self.soup, name), self.soup)
@@ -134,6 +139,7 @@ def testSerializer(element):
     def serializeElement(element, indent=0):
         if isinstance(element, Declaration):
             rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.string))
+            
         elif isinstance(element, BeautifulSoup):
             if element.name == "[document_fragment]":
                 rv.append("#document-fragment")                
