summaryrefslogtreecommitdiffstats
path: root/Lib/xml/etree/ElementTree.py
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2011-11-01 22:31:09 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2011-11-01 22:31:09 (GMT)
commit91d5193b3ad208f359107512ff12a416c9dbec3b (patch)
tree3868c3e9f202850439d6ec606b00eed3db499530 /Lib/xml/etree/ElementTree.py
parentc1e73c30e98c9b59460d0f963a391a08156286e5 (diff)
downloadcpython-91d5193b3ad208f359107512ff12a416c9dbec3b.zip
cpython-91d5193b3ad208f359107512ff12a416c9dbec3b.tar.gz
cpython-91d5193b3ad208f359107512ff12a416c9dbec3b.tar.bz2
Closes #2892: preserve iterparse events in case of SyntaxError.
Diffstat (limited to 'Lib/xml/etree/ElementTree.py')
-rw-r--r--Lib/xml/etree/ElementTree.py38
1 files changed, 23 insertions, 15 deletions
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
index ba33879..f94c48c 100644
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -1250,6 +1250,7 @@ class _IterParseIterator:
self._close_file = close_source
self._events = []
self._index = 0
+ self._error = None
self.root = self._root = None
self._parser = parser
# wire up the parser for event reporting
@@ -1291,24 +1292,31 @@ class _IterParseIterator:
while 1:
try:
item = self._events[self._index]
+ self._index += 1
+ return item
except IndexError:
- if self._parser is None:
- self.root = self._root
- if self._close_file:
- self._file.close()
- raise StopIteration
- # load event buffer
- del self._events[:]
- self._index = 0
- data = self._file.read(16384)
- if data:
+ pass
+ if self._error:
+ e = self._error
+ self._error = None
+ raise e
+ if self._parser is None:
+ self.root = self._root
+ if self._close_file:
+ self._file.close()
+ raise StopIteration
+ # load event buffer
+ del self._events[:]
+ self._index = 0
+ data = self._file.read(16384)
+ if data:
+ try:
self._parser.feed(data)
- else:
- self._root = self._parser.close()
- self._parser = None
+ except SyntaxError as exc:
+ self._error = exc
else:
- self._index = self._index + 1
- return item
+ self._root = self._parser.close()
+ self._parser = None
def __iter__(self):
return self