From: Thomas Wouters <thomas@python.org>
Date: Wed, 27 Jun 2001 14:13:32 +0000 (+0000)
Subject: Backport Tim's checkin 2.247:
X-Git-Tag: v2.1.1c1~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44c3679296a13aec7b46c0939c183c4d86e7c7ab;p=thirdparty%2FPython%2Fcpython.git

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 64dbf983c8aa..690c65357249 100644
--- 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())