According to docs
(http://docs.python.org/3.1/reference/datamodel.html#object.__bool__)
__bool__ can return 1 or 0 instead of True or False.
However, when I ran the following code:

Python 3.1 (r31:73574, Jun 26 2009, 20:21:35) [MSC v.1500 32 bit
(Intel)] on win32
>>> class Spam():
	def __bool__(self):
		return 1

	
>>> if Spam():
	print('ham')

I got the following error:
	
Traceback (most recent call last):
  File "<pyshell#72>", line 1, in <module>
    if Spam():
TypeError: __bool__ should return bool or int, returned int

So, do I misunderstand the docs or is it an error in them?

It's not only the docs, the error message is self-contradictory as well.

Probably a misguided merge. Here is a patch that updates the error 
message, and the documentation.

The patch looks good to me. In particular, removing the test for
using_len looks correct.

The assignment of "result = -1" after PyErr_Format isn't needed, but
doesn't hurt (and it was already there, anyway).

fixed in r73868 (py3k) and r73869 (3.1)
Thanks for the report!