From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 9 Oct 2000 16:45:54 +0000 (+0000)
Subject: _exceptions: Format a missing system id as <unknown>.
X-Git-Tag: v2.0c1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04f4943d132d0d5e9829923706a2cb07a2b0ae9f;p=python

_exceptions: Format a missing system id as <unknown>.
expatreader: Use the error handler instead of raising exception directly.
---

diff --git a/Lib/xml/sax/_exceptions.py b/Lib/xml/sax/_exceptions.py
index 1804f3fde2..88ec8ca598 100644
--- a/Lib/xml/sax/_exceptions.py
+++ b/Lib/xml/sax/_exceptions.py
@@ -79,10 +79,11 @@ class SAXParseException(SAXException):
 
     def __str__(self):
         "Create a string representation of the exception."
-        return "%s at %s:%d:%d" % (self._msg,
-                                   self.getSystemId(),
-                                   self.getLineNumber(),
-                                   self.getColumnNumber())
+        sysid = self.getSystemId()
+        if sysid is None:
+            sysid = "<unknown>"
+        return "%s:%d:%d: %s" % (sysid, self.getLineNumber(),
+                                 self.getColumnNumber(), self._msg)
 
 
 # ===== SAXNOTRECOGNIZEDEXCEPTION =====
diff --git a/Lib/xml/sax/expatreader.py b/Lib/xml/sax/expatreader.py
index 14bc0877e1..1414bb5f68 100644
--- a/Lib/xml/sax/expatreader.py
+++ b/Lib/xml/sax/expatreader.py
@@ -81,7 +81,8 @@ class ExpatParser(xmlreader.IncrementalParser, xmlreader.Locator):
             self._parser.Parse(data, isFinal)
         except expat.error:
             error_code = self._parser.ErrorCode
-            raise SAXParseException(expat.ErrorString(error_code), None, self)
+            exc = SAXParseException(expat.ErrorString(error_code), None, self)
+            self._err_handler.fatalError(exc)
 
     def close(self):
         if self._entity_stack: