summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2005-11-22 19:03:16 (GMT)
committerAndrew M. Kuchling <amk@amk.ca>2005-11-22 19:03:16 (GMT)
commit841d25ee664d7e77caa6169401f9dff696c738da (patch)
tree595279cb2d688651a1954cbbaacf0d4854c06a8e
parentbb7e800506c5d27c9105bc47b09ac368dddb4492 (diff)
downloadcpython-841d25ee664d7e77caa6169401f9dff696c738da.zip
cpython-841d25ee664d7e77caa6169401f9dff696c738da.tar.gz
cpython-841d25ee664d7e77caa6169401f9dff696c738da.tar.bz2
[Patch #1094164] replaceChild(x,x) ends up removing x of the tree. Add fix from Felix Rabe and a test case
-rw-r--r--Lib/test/test_minidom.py11
-rw-r--r--Lib/xml/dom/minidom.py4
2 files changed, 13 insertions, 2 deletions
diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
index 8b4c715..68aac0f 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("<doc><e/></doc>")
+ 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("<doc>a<e/>d</doc>")
diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py
index 4bb4ef4..84be99b 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: