[Python-checkins] r86765 - in python/branches/release27-maint: Lib/test/test_minidom.py Lib/xml/dom/minidom.py Misc/NEWS

[georg.brandl]

Author: georg.brandl
Date: Fri Nov 26 08:35:31 2010
New Revision: 86765

Log:
Merged revisions 85546-85547 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85546 | georg.brandl | 2010-10-15 19:58:45 +0200 (Fr, 15 Okt 2010) | 1 line
  
  #5762: fix handling of empty namespace in minidom, which would result in AttributeError on toxml().
........
  r85547 | georg.brandl | 2010-10-15 20:00:35 +0200 (Fr, 15 Okt 2010) | 1 line
  
  #6098: Refrain from claiming DOM level 3 conformance in minidom.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/test/test_minidom.py
   python/branches/release27-maint/Lib/xml/dom/minidom.py
   python/branches/release27-maint/Misc/NEWS

Modified: python/branches/release27-maint/Lib/test/test_minidom.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_minidom.py	(original)
+++ python/branches/release27-maint/Lib/test/test_minidom.py	Fri Nov 26 08:35:31 2010
@@ -1483,6 +1483,13 @@
         doc.appendChild(doc.createComment("foo--bar"))
         self.assertRaises(ValueError, doc.toxml)
 
+    def testEmptyXMLNSValue(self):
+        doc = parseString("<element xmlns=''>\n"
+                          "<foo/>\n</element>")
+        doc2 = parseString(doc.toxml())
+        self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE)
+
+
 def test_main():
     run_unittest(MinidomTest)
 

Modified: python/branches/release27-maint/Lib/xml/dom/minidom.py
==============================================================================
--- python/branches/release27-maint/Lib/xml/dom/minidom.py	(original)
+++ python/branches/release27-maint/Lib/xml/dom/minidom.py	Fri Nov 26 08:35:31 2010
@@ -291,9 +291,10 @@
 
 def _write_data(writer, data):
     "Writes datachars to writer."
-    data = data.replace("&", "&amp;").replace("<", "&lt;")
-    data = data.replace("\"", "&quot;").replace(">", "&gt;")
-    writer.write(data)
+    if data:
+        data = data.replace("&", "&amp;").replace("<", "&lt;"). \
+                    replace("\"", "&quot;").replace(">", "&gt;")
+        writer.write(data)
 
 def _get_elements_by_tagName_helper(parent, name, rc):
     for node in parent.childNodes:
@@ -1340,11 +1341,9 @@
 class DOMImplementation(DOMImplementationLS):
     _features = [("core", "1.0"),
                  ("core", "2.0"),
-                 ("core", "3.0"),
                  ("core", None),
                  ("xml", "1.0"),
                  ("xml", "2.0"),
-                 ("xml", "3.0"),
                  ("xml", None),
                  ("ls-load", "3.0"),
                  ("ls-load", None),

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Fri Nov 26 08:35:31 2010
@@ -15,6 +15,11 @@
 
 - Issue #10459: Update CJK character names to Unicode 5.2.
 
+- Issue #6098: Don't claim DOM level 3 conformance in minidom.
+
+- Issue #5762: Fix AttributeError raised by ``xml.dom.minidom`` when an empty
+  XML namespace attribute is encountered.
+
 - Issue #1710703: Write structures for an empty ZIP archive when a ZipFile is
   created in modes 'a' or 'w' and then closed without adding any files. Raise
   BadZipfile (rather than IOError) when opening small non-ZIP files.