summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2004-08-25 10:42:41 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2004-08-25 10:42:41 (GMT)
commit8d494f3241f8a731f959ed1573b95b3a80bb4932 (patch)
tree4687cba302ba9ce3cebc1808be3efaf613bc1fcd /Doc
parentb92b7ed9d64d8a57994052ccaf0f3c5526efe48c (diff)
downloadcpython-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 'Doc')
-rw-r--r--Doc/lib/libfuncs.tex2
1 files changed, 1 insertions, 1 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}