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
........

diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
index 1f0b229fb26bb054ffd46545c22d96cb07ef1cb5..8fbc5786cd8b7b2af9110faef7a567981f989edb 100644 (file)
--- a/Lib/test/test_minidom.py
+++ b/Lib/test/test_minidom.py
@@ -945,6 +945,14 @@ class MinidomTest(unittest.TestCase):
         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

diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py
index 02e3b85d4328628d1bad958dc8e013f863cbfad6..12b7afce39ef35d09c7337eb1981f42b849a0bd8 100644 (file)
--- a/Lib/xml/dom/minidom.py
+++ b/Lib/xml/dom/minidom.py
@@ -890,6 +890,10 @@ class Childless:
         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")