traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #2892: preserve iterparse events in case of SyntaxError

This commit is contained in:
Florent Xicluna 2011-11-01 23:34:41 +01:00
parent 7e82b276dd
commit 0965ee213e
3 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_xml_etree.py
View File

@ -739,6 +739,7 @@ def iterparse():
... except ET.ParseError, v: ... except ET.ParseError, v:
... print v ... print v
junk after document element: line 1, column 12 junk after document element: line 1, column 12
end document
""" """
def writefile(): def writefile():

14
Lib/xml/etree/ElementTree.py
View File

@ -1210,6 +1210,7 @@ class _IterParseIterator(object):
self._close_file = close_source self._close_file = close_source
self._events = [] self._events = []
self._index = 0 self._index = 0
self._error = None
self.root = self._root = None self.root = self._root = None
self._parser = parser self._parser = parser
# wire up the parser for event reporting # wire up the parser for event reporting
@ -1255,7 +1256,14 @@ class _IterParseIterator(object):
while 1: while 1:
try: try:
item = self._events[self._index] item = self._events[self._index]
self._index += 1
return item
except IndexError: except IndexError:
pass
if self._error:
e = self._error
self._error = None
raise e
if self._parser is None: if self._parser is None:
self.root = self._root self.root = self._root
if self._close_file: if self._close_file:
@ -1266,13 +1274,13 @@ class _IterParseIterator(object):
self._index = 0 self._index = 0
data = self._file.read(16384) data = self._file.read(16384)
if data: if data:
try:
self._parser.feed(data) self._parser.feed(data)
except SyntaxError as exc:
self._error = exc
else: else:
self._root = self._parser.close() self._root = self._parser.close()
self._parser = None self._parser = None
else:
self._index = self._index + 1
return item
def __iter__(self): def __iter__(self):
return self return self

14
Modules/_elementtree.c
View File

@ -2970,6 +2970,7 @@ init_elementtree(void)
" self._file = file\n" " self._file = file\n"
" self._events = []\n" " self._events = []\n"
" self._index = 0\n" " self._index = 0\n"
" self._error = None\n"
" self.root = self._root = None\n" " self.root = self._root = None\n"
" b = cElementTree.TreeBuilder()\n" " b = cElementTree.TreeBuilder()\n"
" self._parser = cElementTree.XMLParser(b)\n" " self._parser = cElementTree.XMLParser(b)\n"
@ -2978,7 +2979,14 @@ init_elementtree(void)
" while 1:\n" " while 1:\n"
" try:\n" " try:\n"
" item = self._events[self._index]\n" " item = self._events[self._index]\n"
" self._index += 1\n"
" return item\n"
" except IndexError:\n" " except IndexError:\n"
" pass\n"
" if self._error:\n"
" e = self._error\n"
" self._error = None\n"
" raise e\n"
" if self._parser is None:\n" " if self._parser is None:\n"
" self.root = self._root\n" " self.root = self._root\n"
" if self._close_file:\n" " if self._close_file:\n"
@ -2989,13 +2997,13 @@ init_elementtree(void)
" self._index = 0\n" " self._index = 0\n"
" data = self._file.read(16384)\n" " data = self._file.read(16384)\n"
" if data:\n" " if data:\n"
" try:\n"
" self._parser.feed(data)\n" " self._parser.feed(data)\n"
" except SyntaxError as exc:\n"
" self._error = exc\n"
" else:\n" " else:\n"
" self._root = self._parser.close()\n" " self._root = self._parser.close()\n"
" self._parser = None\n" " self._parser = None\n"
" else:\n"
" self._index = self._index + 1\n"
" return item\n"
" def __iter__(self):\n" " def __iter__(self):\n"
" return self\n" " return self\n"
"cElementTree.iterparse = iterparse\n" "cElementTree.iterparse = iterparse\n"