mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-45614: Fix traceback display for exceptions with invalid module name (GH-29726) (GH-29826)

Browse source 
(cherry picked from commit 4dfae6f38e)
This commit is contained in:
Irit Katriel 2021-11-29 10:07:24 +00:00 • committed by GitHub
parent 305236e03a
commit 4d2cc3ed46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/test/test_traceback.py
View file

@ -785,6 +785,17 @@ class BaseExceptionReportingTests:
err = self.get_report(Exception(''))
self.assertIn('Exception\n', 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_syntax_error_various_offsets(self):
for offset in range(-5, 10):
for add in [0, 2]:

2
Lib/traceback.py
View file

@ -604,6 +604,8 @@ class TracebackException:
stype = self.exc_type.__qualname__
smod = self.exc_type.__module__
if smod not in ("__main__", "builtins"):
if not isinstance(smod, str):
smod = "<unknown>"
stype = smod + '.' + stype
if not issubclass(self.exc_type, SyntaxError):

1
Misc/NEWS.d/next/Core and Builtins/2021-11-23-12-06-41.bpo-45614.fIekgI.rst Normal file
View file

@ -0,0 +1 @@
Fix :mod:`traceback` display for exceptions with invalid module name.

2
Python/pythonrun.c
View file

@ -972,7 +972,7 @@ print_exception(PyObject *f, PyObject *value)
{
Py_XDECREF(modulename);
PyErr_Clear();
err = PyFile_WriteString("<unknown>", f);
err = PyFile_WriteString("<unknown>.", f);
}
else {
if (!_PyUnicode_EqualToASCIIId(modulename, &PyId_builtins))