Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

_exceptions: Format a missing system id as <unknown>. 

expatreader: Use the error handler instead of raising exception directly.
This commit is contained in:
Martin v. Löwis 2000-10-09 16:45:54 +00:00
parent 3383792c74
commit 04f4943d13
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/xml/sax/_exceptions.py
View File

@ -79,10 +79,11 @@ class SAXParseException(SAXException):
def __str__(self): def __str__(self):
"Create a string representation of the exception." "Create a string representation of the exception."
return "%s at %s:%d:%d" % (self._msg, sysid = self.getSystemId()
self.getSystemId(), if sysid is None:
self.getLineNumber(), sysid = "<unknown>"
self.getColumnNumber()) return "%s:%d:%d: %s" % (sysid, self.getLineNumber(),
self.getColumnNumber(), self._msg)
# ===== SAXNOTRECOGNIZEDEXCEPTION ===== # ===== SAXNOTRECOGNIZEDEXCEPTION =====

3
Lib/xml/sax/expatreader.py
View File

@ -81,7 +81,8 @@ class ExpatParser(xmlreader.IncrementalParser, xmlreader.Locator):
self._parser.Parse(data, isFinal) self._parser.Parse(data, isFinal)
except expat.error: except expat.error:
error_code = self._parser.ErrorCode 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): def close(self):
if self._entity_stack: if self._entity_stack: