mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge 3.2: issue #2892

Browse source
This commit is contained in:
Florent Xicluna 2011-11-01 23:33:14 +01:00
commit f24e7e6c41
4 changed files with 53 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Modules/_elementtree.c
View file

@ -3016,6 +3016,7 @@ PyInit__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"
@ -3024,24 +3025,31 @@ PyInit__elementtree(void)
" while 1:\n"
" try:\n"
" item = self._events[self._index]\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"
" self._parser.feed(data)\n"
" else:\n"
" self._root = self._parser.close()\n"
" self._parser = None\n"
" else:\n"
" self._index = self._index + 1\n"
" self._index += 1\n"
" return item\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"
" 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"
" except SyntaxError as exc:\n"
" self._error = exc\n"
" else:\n"
" self._root = self._parser.close()\n"
" self._parser = None\n"
" def __iter__(self):\n"
" return self\n"
"cElementTree.iterparse = iterparse\n"