From: Guido van Rossum <guido@python.org>
Date: Sun, 10 Mar 2002 14:11:16 +0000 (+0000)
Subject: Bugfix candidate.
X-Git-Tag: v2.3c1~6534
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfce3bf908f9f6e8b20d54ca5f724994f6790f8a;p=python

Bugfix candidate.
Adapter from SF patch 528038; fixes SF bug 527816.

The wrapper for __nonzero__ should be wrap_inquiry rather than
wrap_unaryfunc, since the slot returns an int, not a PyObject *.
---

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index df6d6f291d..2ad1638a29 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3508,7 +3508,7 @@ static slotdef slotdefs[] = {
 	UNSLOT("__pos__", nb_positive, slot_nb_positive, wrap_unaryfunc, "+x"),
 	UNSLOT("__abs__", nb_absolute, slot_nb_absolute, wrap_unaryfunc,
 	       "abs(x)"),
-	UNSLOT("__nonzero__", nb_nonzero, slot_nb_nonzero, wrap_unaryfunc,
+	UNSLOT("__nonzero__", nb_nonzero, slot_nb_nonzero, wrap_inquiry,
 	       "x != 0"),
 	UNSLOT("__invert__", nb_invert, slot_nb_invert, wrap_unaryfunc, "~x"),
 	BINSLOT("__lshift__", nb_lshift, slot_nb_lshift, "<<"),