diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-02-01 08:12:03 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-02-01 08:12:03 (GMT) |
| commit | 400adb030a78c3fcb1eb458b25c990449fbf3c93 (patch) | |
| tree | 8dc99c561ec91ec9d2f887eb7b04e7227d30b8ac /Doc | |
| parent | a7712090f78d19d0711553d58e403c9fa44474a8 (diff) | |
| download | cpython-400adb030a78c3fcb1eb458b25c990449fbf3c93.zip cpython-400adb030a78c3fcb1eb458b25c990449fbf3c93.tar.gz cpython-400adb030a78c3fcb1eb458b25c990449fbf3c93.tar.bz2 | |
Merged revisions 60475-60479,60481-60488 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60482 | raymond.hettinger | 2008-01-31 23:07:16 +0100 (Thu, 31 Jan 2008) | 1 line
Minor wordsmithing on docstring
........
r60483 | mark.dickinson | 2008-01-31 23:17:37 +0100 (Thu, 31 Jan 2008) | 5 lines
Issue #1678380. Fix a bug that identifies 0j and -0j when they appear
in the same code unit. The fix is essentially the same as the fix for a
previous bug identifying 0. and -0.
........
r60484 | christian.heimes | 2008-02-01 00:08:23 +0100 (Fri, 01 Feb 2008) | 1 line
Fixed bug #1983: Return from fork() is pid_t, not int
........
r60486 | jeffrey.yasskin | 2008-02-01 07:22:46 +0100 (Fri, 01 Feb 2008) | 4 lines
Move __builtins__.trunc() to math.trunc() per
http://mail.python.org/pipermail/python-dev/2008-January/076626.html and issue
1965.
........
r60487 | jeffrey.yasskin | 2008-02-01 08:05:46 +0100 (Fri, 01 Feb 2008) | 3 lines
Roll back r60248. It's useful to encourage users not to change Rational
instances.
........
r60488 | neal.norwitz | 2008-02-01 08:22:59 +0100 (Fri, 01 Feb 2008) | 1 line
Fix refleak
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/functions.rst | 6 | ||||
| -rw-r--r-- | Doc/library/math.rst | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index afa9198..596e8a0 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1059,12 +1059,6 @@ available. They are listed here in alphabetical order. operators such as ``super(C, self)[name]``. -.. function:: trunc(x) - - Return the :class:`Real` value *x* truncated to an :class:`Integral` (usually - a long integer). Delegates to ``x.__trunc__()``. - - .. function:: tuple([iterable]) Return a tuple whose items are the same and in the same order as *iterable*'s diff --git a/Doc/library/math.rst b/Doc/library/math.rst index 958d60b..55f7933 100644 --- a/Doc/library/math.rst +++ b/Doc/library/math.rst @@ -96,6 +96,14 @@ Number-theoretic and representation functions: Return the fractional and integer parts of *x*. Both results carry the sign of *x*, and both are floats. + +.. function:: trunc(x) + + Return the :class:`Real` value *x* truncated to an :class:`Integral` (usually + a long integer). Delegates to ``x.__trunc__()``. + + .. versionadded:: 2.6 + Note that :func:`frexp` and :func:`modf` have a different call/return pattern than their C equivalents: they take a single argument and return a pair of values, rather than returning their second return value through an 'output |