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

diff --git a/Python/ceval.c b/Python/ceval.c
index d5e3a4e9a16d608326c7eac34a3ac8f238f056d7..df160f2cc35da86b1e90cfc6a9e60a4bdcf19d02 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2493,8 +2493,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);