summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-07-07 00:43:08 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-07-07 00:43:08 (GMT)
commit097cd072c052382d9a85375340b90ab59ce243f7 (patch)
tree828c079b6ac06ffdc3f80b28e8a22c8c40ccbf13 /Objects
parentdd07ebb44a9c5c632d1a8177fcf617b5af1250ec (diff)
downloadcpython-097cd072c052382d9a85375340b90ab59ce243f7.zip
cpython-097cd072c052382d9a85375340b90ab59ce243f7.tar.gz
cpython-097cd072c052382d9a85375340b90ab59ce243f7.tar.bz2
#6428: py3k requires that __bool__ return a bool (and not an int)
Fix the error message and the documentation.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/typeobject.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 0e79542..60483e7 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4807,10 +4807,8 @@ slot_nb_bool(PyObject *self)
}
else {
PyErr_Format(PyExc_TypeError,
- "%s should return "
- "bool or int, returned %s",
- (using_len ? "__len__"
- : "__bool__"),
+ "__bool__ should return "
+ "bool, returned %s",
Py_TYPE(temp)->tp_name);
result = -1;
}