Commit27ecbd5

authored and

committed

[3.9] bpo-43292: Fix file leak inET.iterparse() when not exhausted (pythonGH-31696) (pythonGH-31720)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>(cherry picked from commit496c428)Co-authored-by: Jacob Walls <jacobtylerwalls@gmail.com>

1 parentb788a2f commit27ecbd5Copy full SHA for 27ecbd5

File tree

+20

-7

lines changed

+20

-7

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -640,6 +640,14 @@ def test_iterparse(self):`
`640`	`640`	`'junk after document element: line 1, column 12')`
`641`	`641`	`delcm,it`
`642`	`642`
	`643`	`+# Not exhausting the iterator still closes the resource (bpo-43292)`
	`644`	`+withsupport.check_no_resource_warning(self):`
	`645`	`+it=iterparse(TESTFN)`
	`646`	`+delit`
	`647`	`+`
	`648`	`+withself.assertRaises(FileNotFoundError):`
	`649`	`+iterparse("nonexistent")`
	`650`	`+`
`643`	`651`	`deftest_writefile(self):`
`644`	`652`	`elem=ET.Element("tag")`
`645`	`653`	`elem.text="text"`

Lines changed: 9 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1248,8 +1248,14 @@ def iterparse(source, events=None, parser=None):`
`1248`	`1248`	`# Use the internal, undocumented _parser argument for now; When the`
`1249`	`1249`	`# parser argument of iterparse is removed, this can be killed.`
`1250`	`1250`	`pullparser=XMLPullParser(events=events,_parser=parser)`
`1251`		`-defiterator():`
	`1251`	`+`
	`1252`	`+defiterator(source):`
	`1253`	`+close_source=False`
`1252`	`1254`	`try:`
	`1255`	`+ifnothasattr(source,"read"):`
	`1256`	`+source=open(source,"rb")`
	`1257`	`+close_source=True`
	`1258`	`+yieldNone`
`1253`	`1259`	`whileTrue:`
`1254`	`1260`	`yieldfrompullparser.read_events()`
`1255`	`1261`	`# load event buffer`
`@@ -1265,16 +1271,12 @@ def iterator():`
`1265`	`1271`	`source.close()`
`1266`	`1272`
`1267`	`1273`	`classIterParseIterator(collections.abc.Iterator):`
`1268`		`-__next__=iterator().__next__`
	`1274`	`+__next__=iterator(source).__next__`
`1269`	`1275`	`it=IterParseIterator()`
`1270`	`1276`	`it.root=None`
`1271`	`1277`	`deliterator,IterParseIterator`
`1272`	`1278`
`1273`		`-close_source=False`
`1274`		`-ifnothasattr(source,"read"):`
`1275`		`-source=open(source,"rb")`
`1276`		`-close_source=True`
`1277`		`-`
	`1279`	`+next(it)`
`1278`	`1280`	`returnit`
`1279`	`1281`
`1280`	`1282`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1836,6 +1836,7 @@ Wojtek Walczak`
`1836`	`1836`	`Charles Waldman`
`1837`	`1837`	`Richard Walker`
`1838`	`1838`	`Larry Wall`
	`1839`	`+Jacob Walls`
`1839`	`1840`	`Kevin Walzer`
`1840`	`1841`	`Rodrigo Steinmuller Wanderley`
`1841`	`1842`	`Dingyuan Wang`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fixed a file leak in:func:`xml.etree.ElementTree.iterparse` when the
	`2`	`+iterator is not exhausted. Patch by Jacob Walls.`

Comments

(0)