Merge 3.2: issue #2892
authorFlorent Xicluna <florent.xicluna@gmail.com>
Tue, 1 Nov 2011 22:33:14 +0000 (23:33 +0100)
committerFlorent Xicluna <florent.xicluna@gmail.com>
Tue, 1 Nov 2011 22:33:14 +0000 (23:33 +0100)
1  2 
Lib/test/test_xml_etree.py
Misc/NEWS
Modules/_elementtree.c

Simple merge
diff --cc Misc/NEWS
index b05c966057acb546d929c5ec2733662930539053,9e7a96cc2f2d7ef85b92edda6ec4b6eb96eb8f36..3cd76218fe1ce50f41eb696b2a40bb398b08084e
+++ b/Misc/NEWS
@@@ -350,9 -66,8 +350,11 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #2892: preserve iterparse events in case of SyntaxError.
 +- Issue #13287: urllib.request and urllib.error now contains a __all__ and
 +  exposes only relevant Classes, Functions. Patch by Florent Xicluna.
 +
  - Issue #670664: Fix HTMLParser to correctly handle the content of
    ``<script>...</script>`` and ``<style>...</style>``.
  
Simple merge