Merged revisions 73868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r73868 | amaury.forgeotdarc | 2009-07-07 02:43:08 +0200 (mar., 07 juil. 2009) | 3 lines
#6428: py3k requires that __bool__ return a bool (and not an int)
Fix the error message and the documentation.
........
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 2161706..d0aa59f 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1254,11 +1254,11 @@
.. index:: single: __len__() (mapping object method)
Called to implement truth value testing and the built-in operation
- ``bool()``; should return ``False`` or ``True``, or their integer equivalents
- ``0`` or ``1``. When this method is not defined, :meth:`__len__` is called,
- if it is defined, and the object is considered true if its result is nonzero.
- If a class defines neither :meth:`__len__` nor :meth:`__bool__`, all its
- instances are considered true.
+ ``bool()``; should return ``False`` or ``True``. When this method is not
+ defined, :meth:`__len__` is called, if it is defined, and the object is
+ considered true if its result is nonzero. If a class defines neither
+ :meth:`__len__` nor :meth:`__bool__`, all its instances are considered
+ true.
.. _attribute-access: