[Python-checkins] python/dist/src/Python bltinmodule.c,2.317,2.318

[loewis at users.sourceforge.net]

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

Modified Files:
	bltinmodule.c 
Log Message:
Patch #1015021: Stop claiming that coerce can return None.
Will backport to 2.3.


Index: bltinmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.317
retrieving revision 2.318
diff -u -d -r2.317 -r2.318
--- bltinmodule.c	12 Aug 2004 14:42:37 -0000	2.317
+++ bltinmodule.c	25 Aug 2004 10:42:41 -0000	2.318
@@ -322,11 +322,11 @@
 }
 
 PyDoc_STRVAR(coerce_doc,
-"coerce(x, y) -> None or (x1, y1)\n\
+"coerce(x, y) -> (x1, y1)\n\
 \n\
-When x and y can be coerced to values of the same type, return a tuple\n\
-containing the coerced values.  When they can't be coerced, return None.");
-
+Return a tuple consisting of the two numeric arguments converted to\n\
+a common type, using the same rules as used by arithmetic operations.\n\
+If coercion is not possible, raise TypeError.");
 
 static PyObject *
 builtin_compile(PyObject *self, PyObject *args)