mirror of
https://github.com/python/cpython.git
synced 2025-10-12 01:43:12 +00:00
bpo-45614: Fix traceback display for exceptions with invalid module name (GH-29726)
This commit is contained in:
parent
e71c12efcd
commit
4dfae6f38e
4 changed files with 15 additions and 1 deletions
|
@ -1254,6 +1254,17 @@ class BaseExceptionReportingTests:
|
||||||
exp = "%s: %s\n" % (str_name, str_value)
|
exp = "%s: %s\n" % (str_name, str_value)
|
||||||
self.assertEqual(exp, err)
|
self.assertEqual(exp, err)
|
||||||
|
|
||||||
|
def test_exception_modulename_not_unicode(self):
|
||||||
|
class X(Exception):
|
||||||
|
def __str__(self):
|
||||||
|
return "I am X"
|
||||||
|
|
||||||
|
X.__module__ = 42
|
||||||
|
|
||||||
|
err = self.get_report(X())
|
||||||
|
exp = f'<unknown>.{X.__qualname__}: I am X\n'
|
||||||
|
self.assertEqual(exp, err)
|
||||||
|
|
||||||
def test_exception_bad__str__(self):
|
def test_exception_bad__str__(self):
|
||||||
class X(Exception):
|
class X(Exception):
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
|
|
|
@ -808,6 +808,8 @@ class TracebackException:
|
||||||
stype = self.exc_type.__qualname__
|
stype = self.exc_type.__qualname__
|
||||||
smod = self.exc_type.__module__
|
smod = self.exc_type.__module__
|
||||||
if smod not in ("__main__", "builtins"):
|
if smod not in ("__main__", "builtins"):
|
||||||
|
if not isinstance(smod, str):
|
||||||
|
smod = "<unknown>"
|
||||||
stype = smod + '.' + stype
|
stype = smod + '.' + stype
|
||||||
|
|
||||||
if not issubclass(self.exc_type, SyntaxError):
|
if not issubclass(self.exc_type, SyntaxError):
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Fix :mod:`traceback` display for exceptions with invalid module name.
|
|
@ -1022,7 +1022,7 @@ print_exception(struct exception_print_context *ctx, PyObject *value)
|
||||||
{
|
{
|
||||||
Py_XDECREF(modulename);
|
Py_XDECREF(modulename);
|
||||||
PyErr_Clear();
|
PyErr_Clear();
|
||||||
err = PyFile_WriteString("<unknown>", f);
|
err = PyFile_WriteString("<unknown>.", f);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (!_PyUnicode_EqualToASCIIId(modulename, &PyId_builtins) &&
|
if (!_PyUnicode_EqualToASCIIId(modulename, &PyId_builtins) &&
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue