diff options
| author | Irit Katriel <1055913+iritkatriel@users.noreply.github.com> | 2021-11-27 22:00:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-27 22:00:10 (GMT) |
| commit | 4dfae6f38e1720ddafcdd68043e476ecb41cb4d5 (patch) | |
| tree | f4b3c2b296051e5f4ac3e4fdc9f4183758f65b4a | |
| parent | e71c12efcddc1076d5367461a5b416092267aa77 (diff) | |
| download | cpython-4dfae6f38e1720ddafcdd68043e476ecb41cb4d5.zip cpython-4dfae6f38e1720ddafcdd68043e476ecb41cb4d5.tar.gz cpython-4dfae6f38e1720ddafcdd68043e476ecb41cb4d5.tar.bz2 | |
bpo-45614: Fix traceback display for exceptions with invalid module name (GH-29726)
| -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 d88851d..cde35f5 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -1254,6 +1254,17 @@ class BaseExceptionReportingTests: exp = "%s: %s\n" % (str_name, str_value) 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): class X(Exception): def __str__(self): diff --git a/Lib/traceback.py b/Lib/traceback.py index 97caa13..77f8590 100644 --- a/Lib/traceback.py +++ b/Lib/traceback.py @@ -808,6 +808,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 0000000..4255e18 --- /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 2c0950e..2f68b21 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1022,7 +1022,7 @@ print_exception(struct exception_print_context *ctx, PyObject *value) { Py_XDECREF(modulename); PyErr_Clear(); - err = PyFile_WriteString("<unknown>", f); + err = PyFile_WriteString("<unknown>.", f); } else { if (!_PyUnicode_EqualToASCIIId(modulename, &PyId_builtins) && |