[Python-checkins] python/dist/src/Objects typeobject.c, 2.266, 2.267

[anthonybaxter@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1043/Objects

Modified Files:
	typeobject.c 
Log Message:
fix object.__divmod__.__doc__

backport candidate


Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.266
retrieving revision 2.267
diff -u -d -r2.266 -r2.267
--- typeobject.c	15 May 2005 15:32:08 -0000	2.266
+++ typeobject.c	3 Jun 2005 14:12:21 -0000	2.267
@@ -4908,6 +4908,12 @@
 #define RBINSLOT(NAME, SLOT, FUNCTION, DOC) \
 	ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_r, \
 	       "x." NAME "(y) <==> y" DOC "x")
+#define BINSLOTNOTINFIX(NAME, SLOT, FUNCTION, DOC) \
+	ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_l, \
+	       "x." NAME "(y) <==> " DOC)
+#define RBINSLOTNOTINFIX(NAME, SLOT, FUNCTION, DOC) \
+	ETSLOT(NAME, as_number.SLOT, FUNCTION, wrap_binaryfunc_r, \
+	       "x." NAME "(y) <==> " DOC)
 
 static slotdef slotdefs[] = {
 	SQSLOT("__len__", sq_length, slot_sq_length, wrap_inquiry,
@@ -4976,9 +4982,9 @@
 		"%"),
 	RBINSLOT("__rmod__", nb_remainder, slot_nb_remainder,
 		 "%"),
-	BINSLOT("__divmod__", nb_divmod, slot_nb_divmod,
+	BINSLOTNOTINFIX("__divmod__", nb_divmod, slot_nb_divmod,
 		"divmod(x, y)"),
-	RBINSLOT("__rdivmod__", nb_divmod, slot_nb_divmod,
+	RBINSLOTNOTINFIX("__rdivmod__", nb_divmod, slot_nb_divmod,
 		 "divmod(y, x)"),
 	NBSLOT("__pow__", nb_power, slot_nb_power, wrap_ternaryfunc,
 	       "x.__pow__(y[, z]) <==> pow(x, y[, z])"),