Cleanup TODOs

rubys · rubys · commit e9672ab6595c · 2007-01-26T21:38:00.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40499
diff --git a/src/liberalxmlparser.py b/src/liberalxmlparser.py
@@ -11,11 +11,6 @@
  * http://wiki.whatwg.org/wiki/HtmlVsXhtml
 
 @@TODO:
- * Produce SAX events based on the produced DOM.  This is intended not to
-   support streaming, but rather to support application level compatibility. 
- * Optional namespace support
- * Investigate the use of <![CDATA[]]> when tokenizer.contentModelFlag
-   indicates CDATA processsing to ensure dual HTML/XHTML compatibility.
  * Selectively lowercase only XHTML, but not foreign markup
 """
 
diff --git a/src/treebuilders/dom.py b/src/treebuilders/dom.py
@@ -139,7 +139,7 @@ def dom2sax(node, handler, nsmap={'xml':XML_NAMESPACE}):
   if node.nodeType == Node.ELEMENT_NODE:
     if not nsmap:
       handler.startElement(node.nodeName, node.attributes)
-      for child in node.childNodes: dom2sax(child, handler)
+      for child in node.childNodes: dom2sax(child, handler, nsmap)
       handler.endElement(node.nodeName)
     else:
       attributes = dict(node.attributes.itemsNS()) 
diff --git a/tests/test_sax.py b/tests/test_sax.py
@@ -30,13 +30,19 @@ class SAXTest(unittest.TestCase):
   def DOMParse(self, input):
     return XMLParser(tree=dom.TreeBuilder).parse(input)
 
+  def setNS(self, saxparser):
+    import xml.dom
+    saxparser.setFeature(xml.sax.handler.feature_namespaces, 1)
+    return {'xml':xml.dom.XML_NAMESPACE}
+
   def saxdiff(self, input):
     domhandler = SAXLogger()
-    dom.dom2sax(self.DOMParse(input), domhandler)
 
     saxhandler = SAXLogger()
     saxparser = xml.sax.make_parser(PREFERRED_XML_PARSERS)
-    saxparser.setFeature(xml.sax.handler.feature_namespaces, 1)
+
+    dom.dom2sax(self.DOMParse(input), domhandler, self.setNS(saxparser))
+
     saxparser.setContentHandler(saxhandler)
     source = xml.sax.xmlreader.InputSource()
     source.setByteStream(StringIO.StringIO(input))
@@ -85,6 +91,11 @@ def test_ns(self):
   </svg>
 </body></html>""")
 
+# Repeat tests without namespace support
+class nonamespaceTest(SAXTest):
+  def setNS(self, saxparser):
+    return None
+
 # Redundantly rerun all tests using the "real" minidom parser, just to be
 # sure that the output is consistent
 class minidomTest(SAXTest):
