changeset:   95893:1fb83fa2cdef
parent:      95890:1320ec1b24af
parent:      95892:7f8cd879687b
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Wed May 06 09:38:22 2015 +0300
files:       Lib/test/test_sax.py Lib/xml/sax/expatreader.py
description:
Issue #24125: Saved error's line and column numbers when an error is occured
during closing expatreader.  Fixed a regression introduced in issue #23865.


diff -r 1320ec1b24af -r 1fb83fa2cdef Lib/test/test_sax.py
--- a/Lib/test/test_sax.py	Wed May 06 07:01:52 2015 +0300
+++ b/Lib/test/test_sax.py	Wed May 06 09:38:22 2015 +0300
@@ -1166,6 +1166,8 @@
         parser = create_parser()
         parser.setContentHandler(ContentHandler()) # do nothing
         self.assertRaises(SAXParseException, parser.parse, StringIO("<foo>"))
+        self.assertEqual(parser.getColumnNumber(), 5)
+        self.assertEqual(parser.getLineNumber(), 1)
 
     def test_sax_parse_exception_str(self):
         # pass various values from a locator to the SAXParseException to
diff -r 1320ec1b24af -r 1fb83fa2cdef Lib/xml/sax/expatreader.py
--- a/Lib/xml/sax/expatreader.py	Wed May 06 07:01:52 2015 +0300
+++ b/Lib/xml/sax/expatreader.py	Wed May 06 09:38:22 2015 +0300
@@ -43,6 +43,9 @@
     _mkproxy = weakref.proxy
     del weakref, _weakref
 
+class _ClosedParser:
+    pass
+
 # --- ExpatLocator
 
 class ExpatLocator(xmlreader.Locator):
@@ -211,16 +214,24 @@
             self._err_handler.fatalError(exc)
 
     def close(self):
-        if self._entity_stack or self._parser is None:
+        if (self._entity_stack or self._parser is None or
+            isinstance(self._parser, _ClosedParser)):
             # If we are completing an external entity, do nothing here
             return
         try:
             self.feed("", isFinal = 1)
             self._cont_handler.endDocument()
-        finally:
             self._parsing = 0
             # break cycle created by expat handlers pointing to our methods
             self._parser = None
+        finally:
+            self._parsing = 0
+            if self._parser is not None:
+                # Keep ErrorColumnNumber and ErrorLineNumber after closing.
+                parser = _ClosedParser()
+                parser.ErrorColumnNumber = self._parser.ErrorColumnNumber
+                parser.ErrorLineNumber = self._parser.ErrorLineNumber
+                self._parser = parser
             try:
                 file = self._source.getCharacterStream()
                 if file is not None: