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

iritkatriel · web-flow · commit 4d2cc3ed46d2 · 2021-11-29T10:07:24.000Z
(cherry picked from commit 4dfae6f)
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
@@ -785,6 +785,17 @@ def test_message_none(self):
         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
@@ -604,6 +604,8 @@ def format_exception_only(self):
         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
@@ -0,0 +1 @@
+Fix :mod:`traceback` display for exceptions with invalid module name.
diff --git 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))

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix :mod:`traceback` display for exceptions with invalid module name.
Original file line number	Diff line number	Diff line change
`@@ -972,7 +972,7 @@ print_exception(PyObject f, PyObject value)`
`972`	`972`	`{`
`973`	`973`	`Py_XDECREF(modulename);`
`974`	`974`	`PyErr_Clear();`
`975`		`- err = PyFile_WriteString("<unknown>", f);`
	`975`	`+ err = PyFile_WriteString("<unknown>.", f);`
`976`	`976`	`}`
`977`	`977`	`else {`
`978`	`978`	`if (!_PyUnicode_EqualToASCIIId(modulename, &PyId_builtins))`