From 8c8cc6b3922582cd31a9c03337da71552413174f Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 3 Jan 2009 22:05:22 +0000 Subject: [PATCH] Manually merge r67868 from 2.6 branch. --- Doc/library/stdtypes.rst | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 7192b1e399..732478ee62 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -338,15 +338,13 @@ Notes: module: math single: floor() (in module math) single: ceil() (in module math) + single: trunc() (in module math) pair: numeric; conversions - pair: C; language - Conversion from floating point to (long or plain) integer may round or - truncate as in C; see functions :func:`math.floor` and :func:`math.ceil` for - well-defined conversions. - - .. deprecated:: 2.6 - Instead, convert floats to long explicitly with :func:`trunc`. + Conversion from floats using :func:`int` or :func:`long` truncates toward + zero like the related function, :func:`math.trunc`. Use the function + :func:`math.floor` to round downward and :func:`math.ceil` to round + upward. (3) See :ref:`built-in-funcs` for a full description. -- 2.50.1