diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-11-01 23:34:41 +0100 |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-11-01 23:34:41 +0100 |
| commit | 0965ee213e079a84686a6cfd1ada125f0ff8d575 (patch) | |
| tree | 968850ba591d77304e6d136492b22d22d447a111 /Modules/_elementtree.c | |
| parent | 7e82b276dd5c1f786e7bd3c1554ac2017a909ab9 (diff) | |
| download | cpython-git-0965ee213e079a84686a6cfd1ada125f0ff8d575.tar.gz | |
Issue #2892: preserve iterparse events in case of SyntaxError
Diffstat (limited to 'Modules/_elementtree.c')
| -rw-r--r-- | Modules/_elementtree.c | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index c368e1456b..379aa01d0a 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -2970,6 +2970,7 @@ init_elementtree(void) " self._file = file\n" " self._events = []\n" " self._index = 0\n" + " self._error = None\n" " self.root = self._root = None\n" " b = cElementTree.TreeBuilder()\n" " self._parser = cElementTree.XMLParser(b)\n" @@ -2978,24 +2979,31 @@ init_elementtree(void) " while 1:\n" " try:\n" " item = self._events[self._index]\n" + " self._index += 1\n" + " return item\n" " except IndexError:\n" - " if self._parser is None:\n" - " self.root = self._root\n" - " if self._close_file:\n" - " self._file.close()\n" - " raise StopIteration\n" - " # load event buffer\n" - " del self._events[:]\n" - " self._index = 0\n" - " data = self._file.read(16384)\n" - " if data:\n" + " pass\n" + " if self._error:\n" + " e = self._error\n" + " self._error = None\n" + " raise e\n" + " if self._parser is None:\n" + " self.root = self._root\n" + " if self._close_file:\n" + " self._file.close()\n" + " raise StopIteration\n" + " # load event buffer\n" + " del self._events[:]\n" + " self._index = 0\n" + " data = self._file.read(16384)\n" + " if data:\n" + " try:\n" " self._parser.feed(data)\n" - " else:\n" - " self._root = self._parser.close()\n" - " self._parser = None\n" + " except SyntaxError as exc:\n" + " self._error = exc\n" " else:\n" - " self._index = self._index + 1\n" - " return item\n" + " self._root = self._parser.close()\n" + " self._parser = None\n" " def __iter__(self):\n" " return self\n" "cElementTree.iterparse = iterparse\n" |