From: Georg Brandl <georg@python.org>
Date: Sun, 15 Mar 2009 21:43:38 +0000 (+0000)
Subject: Fix a small nit in the error message if bool() falls back on __len__ and it returns... 
X-Git-Tag: v2.7a1~1858
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed4cefbedd1817247b94e5880f850bc1c3f6628d;p=python

Fix a small nit in the error message if bool() falls back on __len__ and it returns the wrong type: it would tell the user that __nonzero__ should return bool or int.
---

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 1df37d1996..4c397f7487 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5096,6 +5096,7 @@ slot_nb_nonzero(PyObject *self)
 	PyObject *func, *args;
 	static PyObject *nonzero_str, *len_str;
 	int result = -1;
+	int using_len = 0;
 
 	func = lookup_maybe(self, "__nonzero__", &nonzero_str);
 	if (func == NULL) {
@@ -5104,6 +5105,7 @@ slot_nb_nonzero(PyObject *self)
 		func = lookup_maybe(self, "__len__", &len_str);
 		if (func == NULL)
 			return PyErr_Occurred() ? -1 : 1;
+		using_len = 1;
 	}
 	args = PyTuple_New(0);
 	if (args != NULL) {
@@ -5114,8 +5116,10 @@ slot_nb_nonzero(PyObject *self)
 				result = PyObject_IsTrue(temp);
 			else {
 				PyErr_Format(PyExc_TypeError,
-					     "__nonzero__ should return "
+					     "%s should return "
 					     "bool or int, returned %s",
+					     (using_len ? "__len__"
+					                : "__nonzero__"),
 					     temp->ob_type->tp_name);
 				result = -1;
 			}