From 841d25ee664d7e77caa6169401f9dff696c738da Mon Sep 17 00:00:00 2001 From: "Andrew M. Kuchling" Date: Tue, 22 Nov 2005 19:03:16 +0000 Subject: [PATCH] [Patch #1094164] replaceChild(x,x) ends up removing x of the tree. Add fix from Felix Rabe and a test case --- Lib/test/test_minidom.py | 11 +++++++++++ Lib/xml/dom/minidom.py | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py index 8b4c71523c..68aac0f44a 100644 --- a/Lib/test/test_minidom.py +++ b/Lib/test/test_minidom.py @@ -1127,6 +1127,17 @@ def testWholeText(): checkWholeText(text, "cabd") checkWholeText(text2, "cabd") +def testPatch1094164 (): + doc = parseString("") + elem = doc.documentElement + e = elem.firstChild + confirm(e.parentNode is elem, "Before replaceChild()") + # Check that replacing a child with itself leaves the tree unchanged + elem.replaceChild(e, e) + confirm(e.parentNode is elem, "After replaceChild()") + + + def testReplaceWholeText(): def setup(): doc = parseString("ad") diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py index 4bb4ef49ff..84be99b67a 100644 --- a/Lib/xml/dom/minidom.py +++ b/Lib/xml/dom/minidom.py @@ -135,10 +135,10 @@ class Node(xml.dom.Node, GetattrMagic): if newChild.nodeType not in self._child_node_types: raise xml.dom.HierarchyRequestErr( "%s cannot be child of %s" % (repr(newChild), repr(self))) - if newChild.parentNode is not None: - newChild.parentNode.removeChild(newChild) if newChild is oldChild: return + if newChild.parentNode is not None: + newChild.parentNode.removeChild(newChild) try: index = self.childNodes.index(oldChild) except ValueError: -- 2.40.0