diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2004-08-25 10:42:41 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2004-08-25 10:42:41 (GMT) |
| commit | 8d494f3241f8a731f959ed1573b95b3a80bb4932 (patch) | |
| tree | 4687cba302ba9ce3cebc1808be3efaf613bc1fcd /Python/bltinmodule.c | |
| parent | b92b7ed9d64d8a57994052ccaf0f3c5526efe48c (diff) | |
| download | cpython-8d494f3241f8a731f959ed1573b95b3a80bb4932.zip cpython-8d494f3241f8a731f959ed1573b95b3a80bb4932.tar.gz cpython-8d494f3241f8a731f959ed1573b95b3a80bb4932.tar.bz2 | |
Patch #1015021: Stop claiming that coerce can return None.
Will backport to 2.3.
Diffstat (limited to 'Python/bltinmodule.c')
| -rw-r--r-- | Python/bltinmodule.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) |