Add publicId and systemId to Doctype's while building the tree (not all trees support these attributes)

tbroyer · tbroyer · commit 18fb1145ab1b · 2007-07-09T18:40:05.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40880
diff --git a/src/html5lib/html5parser.py b/src/html5lib/html5parser.py
@@ -322,7 +322,7 @@ def processDoctype(self, name, publicId, systemId, correct):
           systemId != None:
             self.parser.parseError(_("Erroneous DOCTYPE."))
         # XXX need to update DOCTYPE tokens
-        self.tree.insertDoctype(name)
+        self.tree.insertDoctype(name, publicId, systemId)
         
         if publicId == None:
           publicId = ""
diff --git a/src/html5lib/treebuilders/_base.py b/src/html5lib/treebuilders/_base.py
@@ -207,8 +207,11 @@ def elementInActiveFormattingElements(self, name):
                 return item
         return False
 
-    def insertDoctype(self, name):
-        self.document.appendChild(self.doctypeClass(name))
+    def insertDoctype(self, name, publicId, systemId):
+        doctype = self.doctypeClass(name)
+        doctype.publicId = publicId
+        doctype.systemId = systemId
+        self.document.appendChild(doctype)
 
     def insertComment(self, data, parent=None):
         if parent is None:
diff --git a/src/html5lib/treebuilders/dom.py b/src/html5lib/treebuilders/dom.py
@@ -73,9 +73,9 @@ def documentClass(self):
         self.dom = minidom.getDOMImplementation().createDocument(None,None,None)
         return self
 
-    def insertDoctype(self, name):
+    def insertDoctype(self, name, publicId, systemId):
         domimpl = minidom.getDOMImplementation()
-        doctype = domimpl.createDocumentType(name,None,None)
+        doctype = domimpl.createDocumentType(name, publicId, systemId)
         self.document.appendChild(NodeBuilder(doctype))
         doctype.ownerDocument = self.dom
 
diff --git a/src/html5lib/treebuilders/etree.py b/src/html5lib/treebuilders/etree.py
@@ -135,6 +135,24 @@ class DocumentType(Element):
         def __init__(self, name):
             Element.__init__(self, "<!DOCTYPE>") 
             self._element.text = name
+
+        def _getPublicId(self):
+            return self._element.get(u"publicId", None)
+
+        def _setPublicId(self, value):
+            if value is not None:
+                self._element.set(u"publicId", value)
+
+        publicId = property(_getPublicId, _setPublicId)
+    
+        def _getSystemId(self):
+            return self._element.get(u"systemId", None)
+
+        def _setSystemId(self, value):
+            if value is not None:
+                self._element.set(u"systemId", value)
+
+        systemId = property(_getSystemId, _setSystemId)
     
     class Document(Element):
         def __init__(self):
diff --git a/src/html5lib/treebuilders/simpletree.py b/src/html5lib/treebuilders/simpletree.py
@@ -107,6 +107,8 @@ class DocumentType(Node):
     type = 3
     def __init__(self, name):
         Node.__init__(self, name)
+        self.publicId = u""
+        self.systemId = u""
 
     def __unicode__(self):
         if self.name:
diff --git a/src/html5lib/treebuilders/soup.py b/src/html5lib/treebuilders/soup.py
@@ -103,7 +103,7 @@ def documentClass(self):
         self.soup = BeautifulSoup("")
         return Element(self.soup, self.soup)
     
-    def insertDoctype(self, name):
+    def insertDoctype(self, name, publicId, systemId):
         self.soup.insert(0, Declaration(name))
     
     def elementClass(self, name):
