Patch #1015021: Stop claiming that coerce can return None.

Will backport to 2.3.
This commit is contained in:
Martin v. Löwis 2004-08-25 10:42:41 +00:00
parent b92b7ed9d6
commit 8d494f3241
2 changed files with 5 additions and 5 deletions

View File

@ -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}

View File

@ -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)