Mar 7, 2022 · Mar 5, 2022 · Mar 6, 2022 · Mar 6, 2022
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
                    'junk after document element: line 1, column 12')
            del cm, it

        # Not exhausting the iterator still closes the resource (bpo-43292)
        with warnings_helper.check_no_resource_warning(self):
            it = iterparse(TESTFN)
            del it

        with self.assertRaises(FileNotFoundError):
            iterparse("nonexistent")

    def test_writefile(self):
        elem = ET.Element("tag")
        elem.text = "text"
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
    # Use the internal, undocumented _parser argument for now; When the
    # parser argument of iterparse is removed, this can be killed.
    pullparser = XMLPullParser(events=events, _parser=parser)
    def iterator():

    def iterator(source):
        close_source = False
        try:
            if not hasattr(source, "read"):
                source = open(source, "rb")
                close_source = True
            yield None
            while True:
                yield from pullparser.read_events()
                # load event buffer
                source.close()

    class IterParseIterator(collections.abc.Iterator):
        __next__ = iterator().__next__
        __next__ = iterator(source).__next__
    it = IterParseIterator()
    it.root = None
    del iterator, IterParseIterator

    close_source = False
    if not hasattr(source, "read"):
        source = open(source, "rb")
        close_source = True

    next(it)
    return it


diff --git a/Misc/ACKS b/Misc/ACKS
 Charles Waldman
 Richard Walker
 Larry Wall
 Jacob Walls
 Kevin Walzer
 Rodrigo Steinmuller Wanderley
 Dingyuan Wang
diff --git a/Misc/NEWS.d/next/Library/2022-03-05-09-43-53.bpo-25707.gTlclP.rst b/Misc/NEWS.d/next/Library/2022-03-05-09-43-53.bpo-25707.gTlclP.rst
 Fixed a file leak in :func:`xml.etree.ElementTree.iterparse` when the
 iterator is not exhausted. Patch by Jacob Walls.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -658,6 +658,14 @@ def test_iterparse(self):
		'junk after document element: line 1, column 12')
		del cm, it

		# Not exhausting the iterator still closes the resource (bpo-43292)
		with warnings_helper.check_no_resource_warning(self):
		it = iterparse(TESTFN)
		del it

serhiy-storchaka marked this conversation as resolved. Show resolvedHide resolved
		with self.assertRaises(FileNotFoundError):
		iterparse("nonexistent")

		def test_writefile(self):
		elem = ET.Element("tag")
		elem.text = "text"
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1244,8 +1244,14 @@ def iterparse(source, events=None, parser=None):
		# Use the internal, undocumented _parser argument for now; When the
		# parser argument of iterparse is removed, this can be killed.
		pullparser = XMLPullParser(events=events, _parser=parser)
		def iterator():

		def iterator(source):
		close_source = False
		try:
		if not hasattr(source, "read"):
		source = open(source, "rb")
		close_source = True
		yield None
		while True:
		yield from pullparser.read_events()
		# load event buffer
Expand All		@@ -1261,16 +1267,12 @@ def iterator():
		source.close()

		class IterParseIterator(collections.abc.Iterator):
		__next__ = iterator().__next__
		__next__ = iterator(source).__next__
		it = IterParseIterator()
		it.root = None
		del iterator, IterParseIterator

		close_source = False
		if not hasattr(source, "read"):
		source = open(source, "rb")
		close_source = True

		next(it)
		return it


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1879,6 +1879,7 @@ Wojtek Walczak
		Charles Waldman
		Richard Walker
		Larry Wall
		Jacob Walls
		Kevin Walzer
		Rodrigo Steinmuller Wanderley
		Dingyuan Wang
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Fixed a file leak in :func:`xml.etree.ElementTree.iterparse` when the
		iterator is not exhausted. Patch by Jacob Walls.