backport of 2.242:

improved error message-- names the type of the unexpected object

diff --git a/Python/ceval.c b/Python/ceval.c
index ccab1585679b13a39a260e3382f71acc3ff33bbf..72e4b6b7d697953162cecbc1a3e0979e77882525 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2470,8 +2470,9 @@ do_raise(PyObject *type, PyObject *value, PyObject *tb)
        else {
                /* Not something you can raise.  You get an exception
                   anyway, just not what you specified :-) */
-               PyErr_SetString(PyExc_TypeError,
-                   "exceptions must be strings, classes, or instances");
+               PyErr_Format(PyExc_TypeError,
+                            "exceptions must be strings, classes, or "
+                            "instances, not %s", type->ob_type->tp_name);
                goto raise_error;
        }
        PyErr_Restore(type, value, tb);