From 8d494f3241f8a731f959ed1573b95b3a80bb4932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Wed, 25 Aug 2004 10:42:41 +0000 Subject: Patch #1015021: Stop claiming that coerce can return None. Will backport to 2.3. --- Doc/lib/libfuncs.tex | 2 +- Python/bltinmodule.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Doc/lib/libfuncs.tex b/Doc/lib/libfuncs.tex index 1130eb1..d210510 100644 --- a/Doc/lib/libfuncs.tex +++ b/Doc/lib/libfuncs.tex @@ -1180,7 +1180,7 @@ bypass these functions without concerns about missing something important. \begin{funcdesc}{coerce}{x, y} Return a tuple consisting of the two numeric arguments converted to a common type, using the same rules as used by arithmetic - operations. + operations. If coercion is not possible, raise \exception{TypeError}. \end{funcdesc} \begin{funcdesc}{intern}{string} diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index f7715b6..6fbe799 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -322,11 +322,11 @@ builtin_coerce(PyObject *self, PyObject *args) } 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) -- cgit v0.12