diff options
| author | Irit Katriel <1055913+iritkatriel@users.noreply.github.com> | 2021-11-29 10:07:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-29 10:07:24 +0000 |
| commit | 4d2cc3ed46d2453bad92243128e237e7febca714 (patch) | |
| tree | a95052cc836753e3364428617460471c7eba99c1 | |
| parent | 305236e03a274850be8ed399ea3390ee71519ef4 (diff) | |
| download | cpython-git-4d2cc3ed46d2453bad92243128e237e7febca714.tar.gz | |
bpo-45614: Fix traceback display for exceptions with invalid module name (GH-29726) (GH-29826)
(cherry picked from commit 4dfae6f38e1720ddafcdd68043e476ecb41cb4d5)
| -rw-r--r-- | Lib/test/test_traceback.py | 11 | ||||
| -rw-r--r-- | Lib/traceback.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2021-11-23-12-06-41.bpo-45614.fIekgI.rst | 1 | ||||
| -rw-r--r-- | Python/pythonrun.c | 2 |
4 files changed, 15 insertions, 1 deletions
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index ba03ce4629..18cd4aba24 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -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]: diff --git a/Lib/traceback.py b/Lib/traceback.py index 901b99476a..d6a010f415 100644 --- a/Lib/traceback.py +++ b/Lib/traceback.py @@ -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): diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-11-23-12-06-41.bpo-45614.fIekgI.rst b/Misc/NEWS.d/next/Core and Builtins/2021-11-23-12-06-41.bpo-45614.fIekgI.rst new file mode 100644 index 0000000000..4255e1885a --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-11-23-12-06-41.bpo-45614.fIekgI.rst @@ -0,0 +1 @@ +Fix :mod:`traceback` display for exceptions with invalid module name.
\ No newline at end of file diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 5704bcc758..0f1794acec 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -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)) |