[Python-checkins] CVS: python/dist/src/Objects typeobject.c,2.127,2.128
Guido van Rossum
gvanrossum@users.sourceforge.net
Sun, 10 Mar 2002 06:11:19 -0800
Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv27065
Modified Files:
typeobject.c
Log Message:
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 *.
Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.127
retrieving revision 2.128
diff -C2 -d -r2.127 -r2.128
*** typeobject.c 18 Feb 2002 17:46:48 -0000 2.127
--- typeobject.c 10 Mar 2002 14:11:16 -0000 2.128
***************
*** 3509,3513 ****
UNSLOT("__abs__", nb_absolute, slot_nb_absolute, wrap_unaryfunc,
"abs(x)"),
! UNSLOT("__nonzero__", nb_nonzero, slot_nb_nonzero, wrap_unaryfunc,
"x != 0"),
UNSLOT("__invert__", nb_invert, slot_nb_invert, wrap_unaryfunc, "~x"),
--- 3509,3513 ----
UNSLOT("__abs__", nb_absolute, slot_nb_absolute, wrap_unaryfunc,
"abs(x)"),
! UNSLOT("__nonzero__", nb_nonzero, slot_nb_nonzero, wrap_inquiry,
"x != 0"),
UNSLOT("__invert__", nb_invert, slot_nb_invert, wrap_unaryfunc, "~x"),