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

[andrew.kuchling]

Author: andrew.kuchling
Date: Mon Jul 26 01:49:57 2010
New Revision: 83153

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

........
  r83152 | andrew.kuchling | 2010-07-25 19:38:47 -0400 (Sun, 25 Jul 2010) | 1 line
  
  #777884: make .normalize() do nothing for childless nodes, instead of raising an exception
........


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

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	Mon Jul 26 01:49:57 2010
@@ -945,6 +945,14 @@
         doc.unlink()
 
 
+    def testBug0777884(self):
+        doc = parseString("<o>text</o>")
+        text = doc.documentElement.childNodes[0]
+        self.assertEquals(text.nodeType, Node.TEXT_NODE)
+        # Should run quietly, doing nothing.
+        text.normalize()
+        doc.unlink()
+
     def testBug1433694(self):
         doc = parseString("<o><i/>t</o>")
         node = doc.documentElement

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	Mon Jul 26 01:49:57 2010
@@ -890,6 +890,10 @@
         raise xml.dom.NotFoundErr(
             self.nodeName + " nodes do not have children")
 
+    def normalize(self):
+        # For childless nodes, normalize() has nothing to do.
+        pass
+
     def replaceChild(self, newChild, oldChild):
         raise xml.dom.HierarchyRequestErr(
             self.nodeName + " nodes do not have children")