Issue #24125: Saved error's line and column numbers when an error is occured

serhiy-storchaka · serhiy-storchaka · commit ab914780ba61 · 2015-05-06T09:36:06.000+03:00
during closing expatreader. Fixed a regression introduced in issue #23865.
diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py
@@ -1126,6 +1126,8 @@ def test_expat_incomplete(self):
         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 --git a/Lib/xml/sax/expatreader.py b/Lib/xml/sax/expatreader.py
@@ -43,6 +43,9 @@ def _mkproxy(o):
     _mkproxy = weakref.proxy
     del weakref, _weakref
 
+class _ClosedParser:
+    pass
+
 # --- ExpatLocator
 
 class ExpatLocator(xmlreader.Locator):
@@ -211,16 +214,24 @@ def feed(self, data, isFinal = 0):
             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
             bs = self._source.getByteStream()
             if bs is not None:
                 bs.close()
