mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 11:23:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[Patch #1094164] replaceChild(x,x) ends up removing x of the tree. Add fix from Felix Rabe and a test case

Browse source
This commit is contained in:
Andrew M. Kuchling 2005-11-22 19:03:16 +00:00
parent bb7e800506
commit 841d25ee66
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/test/test_minidom.py
View file

@ -1127,6 +1127,17 @@ def testWholeText():
checkWholeText(text, "cabd") checkWholeText(text, "cabd")
checkWholeText(text2, "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 testReplaceWholeText():
def setup(): def setup():
doc = parseString("<doc>a<e/>d</doc>") doc = parseString("<doc>a<e/>d</doc>")

4
Lib/xml/dom/minidom.py
View file

@ -135,10 +135,10 @@ class Node(xml.dom.Node, GetattrMagic):
if newChild.nodeType not in self._child_node_types: if newChild.nodeType not in self._child_node_types:
raise xml.dom.HierarchyRequestErr( raise xml.dom.HierarchyRequestErr(
"%s cannot be child of %s" % (repr(newChild), repr(self))) "%s cannot be child of %s" % (repr(newChild), repr(self)))
if newChild.parentNode is not None:
newChild.parentNode.removeChild(newChild)
if newChild is oldChild: if newChild is oldChild:
return return
if newChild.parentNode is not None:
newChild.parentNode.removeChild(newChild)
try: try:
index = self.childNodes.index(oldChild) index = self.childNodes.index(oldChild)
except ValueError: except ValueError: