From c1079cde2a7676892a9b98703903206b7d26ed1f Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Tue, 30 Mar 2021 14:32:55 -0700 Subject: bpo-43399: Fix ElementTree.extend not working on iterators (GH-24751) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 51a85ddce8b336addcb61b96f04c9c5edef07296) 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 + Misc/NEWS.d/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 341a3c7..d41ff4f 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -314,6 +314,9 @@ class ElementTreeTest(unittest.TestCase): 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 598b569..f8538df 100644 --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -245,7 +245,7 @@ class Element: """ 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 e181c61..39aa954 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1334,6 +1334,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 0000000..0b8dffb --- /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 -- cgit v0.12