Fix for issue 33: Exception when cloning document

rubys · rubys · commit 8bccf2c0f1f5 · 2007-05-18T13:54:28.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40567
diff --git a/src/treebuilders/dom.py b/src/treebuilders/dom.py
@@ -80,9 +80,11 @@ def hilite(self, encoding):
         setattr(self.dom, 'hilite', method)
         return self
 
-    def doctypeClass(self,name):
+    def insertDoctype(self, name):
         domimpl = minidom.getDOMImplementation()
-        return NodeBuilder(domimpl.createDocumentType(name,None,None))
+        doctype = domimpl.createDocumentType(name,None,None)
+        self.document.appendChild(NodeBuilder(doctype))
+        doctype.ownerDocument = self.dom
 
     def elementClass(self, name):
         return NodeBuilder(self.dom.createElement(name))
@@ -126,8 +128,8 @@ def serializeElement(element, indent=0):
         if element.nodeType == Node.DOCUMENT_TYPE_NODE:
             rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.name))
         elif element.nodeType == Node.DOCUMENT_NODE:
-            rv.append("#document")
-        elif element.nodeType == Node.DOCUMENT_FRAGMENT_NODE:
+            rv.append("#document")
+        elif element.nodeType == Node.DOCUMENT_FRAGMENT_NODE:
             rv.append("#document-fragment")
         elif element.nodeType == Node.COMMENT_NODE:
             rv.append("|%s<!-- %s -->"%(' '*indent, element.nodeValue))
@@ -215,10 +217,10 @@ def dom2sax(node, handler, nsmap={'xml':XML_NAMESPACE}):
   elif node.nodeType == Node.DOCUMENT_NODE:
     handler.startDocument()
     for child in node.childNodes: dom2sax(child, handler, nsmap)
-    handler.endDocument()
-
-  elif node.nodeType == Node.DOCUMENT_FRAGMENT_NODE:
-    for child in node.childNodes: dom2sax(child, handler, nsmap)
+    handler.endDocument()
+
+  elif node.nodeType == Node.DOCUMENT_FRAGMENT_NODE:
+    for child in node.childNodes: dom2sax(child, handler, nsmap)
 
   else:
     # ATTRIBUTE_NODE
diff --git a/tests/test_parser2.py b/tests/test_parser2.py
@@ -0,0 +1,34 @@
+#RELEASE remove
+if __name__ == '__main__':
+  import os, sys
+  os.chdir(os.path.split(os.path.abspath(__file__))[0])
+  sys.path.insert(0, os.path.abspath(os.path.join(os.pardir, "src")))
+
+import html5parser
+from treebuilders import dom
+#END RELEASE
+
+#RELEASE add
+#from html5lib import html5parser
+#from html5lib.treebuilders import dom
+#END RELEASE
+
+import unittest
+
+# tests that aren't autogenerated from text files
+class MoreParserTests(unittest.TestCase):
+
+  def test_assertDoctypeCloneable(self):
+    parser = html5parser.HTMLParser(tree=dom.TreeBuilder)
+    doc = parser.parse('<!DOCTYPE HTML>')
+    self.assert_(doc.cloneNode(True))
+
+def buildTestSuite():
+  return unittest.defaultTestLoader.loadTestsFromName(__name__)
+
+def main():
+    buildTestSuite()
+    unittest.main()
+
+if __name__ == '__main__':
+    main()
