From 5375551a7b3afa1de09899ff432c61138bab4190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Preng=C3=A8re?= <2138730+alexprengere@users.noreply.github.com> Date: Tue, 30 Mar 2021 23:11:29 +0200 Subject: [PATCH] bpo-43399: Fix ElementTree.extend not working on iterators (GH-24751) (cherry picked from commit 51a85ddce8b336addcb61b96f04c9c5edef07296) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alex Prengère <2138730+alexprengere@users.noreply.github.com> --- Lib/test/test_xml_etree.py | 3 +++ Lib/xml/etree/ElementTree.py | 2 +- Misc/ACKS | 1 + .../next/Library/2021-03-04-17-53-46.bpo-43399.Wn95u-.rst | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2021-03-04-17-53-46.bpo-43399.Wn95u-.rst diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index 5632b8b503cf3f..bfc0d054ba8b73 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -312,6 +312,9 @@ def test_simpleops(self): elem.extend([e]) self.serialize_check(elem, '') elem.remove(e) + elem.extend(iter([e])) + self.serialize_check(elem, '') + elem.remove(e) element = ET.Element("tag", key="value") self.serialize_check(element, '') # 1 diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py index 7a269001d6e18f..ac82ed8041995d 100644 --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -252,7 +252,7 @@ def extend(self, elements): """ for element in elements: self._assert_is_element(element) - self._children.extend(elements) + self._children.append(element) def insert(self, index, subelement): """Insert *subelement* at position *index*.""" diff --git a/Misc/ACKS b/Misc/ACKS index 73d35c2d86bdc0..4f7c92c9dc0f6a 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1363,6 +1363,7 @@ Matheus Vieira Portela Davin Potts Guillaume Pratte Florian Preinstorfer +Alex Prengère Amrit Prem Paul Prescod Donovan Preston diff --git a/Misc/NEWS.d/next/Library/2021-03-04-17-53-46.bpo-43399.Wn95u-.rst b/Misc/NEWS.d/next/Library/2021-03-04-17-53-46.bpo-43399.Wn95u-.rst new file mode 100644 index 00000000000000..0b8dffb2312e4f --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-03-04-17-53-46.bpo-43399.Wn95u-.rst @@ -0,0 +1,2 @@ +Fix ``ElementTree.extend`` not working on iterators when using the +Python implementation