diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index def1b61810d..5c65333fe00 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -1886,6 +1886,12 @@ def test_basic(self): sourcefile = serialize(doc, to_string=False) self.assertEqual(next(ET.iterparse(sourcefile))[0], 'end') + # With an explitit parser too (issue #9708) + sourcefile = serialize(doc, to_string=False) + parser = ET.XMLParser(target=ET.TreeBuilder()) + self.assertEqual(next(ET.iterparse(sourcefile, parser=parser))[0], + 'end') + tree = ET.ElementTree(None) self.assertRaises(AttributeError, tree.iter) diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py index 85cab2b17b5..aa5e346a694 100644 --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -1743,8 +1743,20 @@ def parse(self, source, parser=None): source.close() class iterparse: + """Parses an XML section into an element tree incrementally. + + Reports what’s going on to the user. 'source' is a filename or file + object containing XML data. 'events' is a list of events to report back. + The supported events are the strings "start", "end", "start-ns" and + "end-ns" (the "ns" events are used to get detailed namespace + information). If 'events' is omitted, only "end" events are reported. + 'parser' is an optional parser instance. If not given, the standard + XMLParser parser is used. Returns an iterator providing + (event, elem) pairs. + """ + root = None - def __init__(self, file, events=None): + def __init__(self, file, events=None, parser=None): self._close_file = False if not hasattr(file, 'read'): file = open(file, 'rb') @@ -1754,8 +1766,9 @@ def __init__(self, file, events=None): self._index = 0 self._error = None self.root = self._root = None - b = TreeBuilder() - self._parser = XMLParser(b) + if parser is None: + parser = XMLParser(target=TreeBuilder()) + self._parser = parser self._parser._setevents(self._events, events) def __next__(self):