aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarikrupnik <ari@30pins.com>2018-06-06 23:42:38 -0500
committerFred Drake <fred@fdrake.net>2018-06-07 00:42:38 -0400
commit5bfa058e65897567889354d7eb34af2b93a20f18 (patch)
treefcbae0b123d4ad0a28db1bfb61bc9b77fc0452fd
parentupdate to Unicode 11.0.0 (closes bpo-33778) (GH-7439) (diff)
downloadcpython-5bfa058e65897567889354d7eb34af2b93a20f18.tar.gz
cpython-5bfa058e65897567889354d7eb34af2b93a20f18.tar.bz2
cpython-5bfa058e65897567889354d7eb34af2b93a20f18.zip
bpo-33274: Compliance with DOM L1: return removed attribute (#7465)
* bpo-33274: Compliance with DOM L1: return removed attribute * Update 2018-06-06-22-01-33.bpo-33274.teYqv8.rst
-rw-r--r--Lib/test/test_minidom.py2
-rw-r--r--Lib/xml/dom/minidom.py1
-rw-r--r--Misc/NEWS.d/next/Library/2018-06-06-22-01-33.bpo-33274.teYqv8.rst3
3 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
index a2cc8828461..e91cdba1eb2 100644
--- a/Lib/test/test_minidom.py
+++ b/Lib/test/test_minidom.py
@@ -325,7 +325,7 @@ class MinidomTest(unittest.TestCase):
node = child.getAttributeNode("spam")
self.assertRaises(xml.dom.NotFoundErr, child.removeAttributeNode,
None)
- child.removeAttributeNode(node)
+ self.assertIs(node, child.removeAttributeNode(node))
self.confirm(len(child.attributes) == 0
and child.getAttributeNode("spam") is None)
dom2 = Document()
diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py
index a5d813f932a..e44e04a069e 100644
--- a/Lib/xml/dom/minidom.py
+++ b/Lib/xml/dom/minidom.py
@@ -823,6 +823,7 @@ class Element(Node):
# Restore this since the node is still useful and otherwise
# unlinked
node.ownerDocument = self.ownerDocument
+ return node
removeAttributeNodeNS = removeAttributeNode
diff --git a/Misc/NEWS.d/next/Library/2018-06-06-22-01-33.bpo-33274.teYqv8.rst b/Misc/NEWS.d/next/Library/2018-06-06-22-01-33.bpo-33274.teYqv8.rst
new file mode 100644
index 00000000000..420652bddf6
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-06-06-22-01-33.bpo-33274.teYqv8.rst
@@ -0,0 +1,3 @@
+W3C DOM Level 1 specifies return value of Element.removeAttributeNode() as
+"The Attr node that was removed." xml.dom.minidom now complies with this
+requirement.