Backport Tim's checkin 2.247:

SF bug 433228:  repr(list) woes when len(list) big
call_object:  If the object isn't callable, display its type in the error
msg rather than its repr.

diff --git a/Python/ceval.c b/Python/ceval.c
index 64dbf983c8aa7e217e593bc01043bc9911397827..690c6535724970f7e1361338635faddf8f88dec9 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2812,8 +2812,9 @@ call_object(PyObject *func, PyObject *arg, PyObject *kw)
        else if ((call = func->ob_type->tp_call) != NULL)
                result = (*call)(func, arg, kw);
        else {
-               PyErr_Format(PyExc_TypeError, "object is not callable: %s",
-                            PyString_AS_STRING(PyObject_Repr(func)));
+               PyErr_Format(PyExc_TypeError,
+                            "object of type '%.100s' is not callable",
+                            func->ob_type->tp_name);
                return NULL;
        }
         if (result == NULL && !PyErr_Occurred())