traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from 3.3

This commit is contained in:
Andrew Kuchling 2014-02-16 12:18:17 -05:00
parent 87a113b807 3137885c36
commit c77974e033
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Doc/library/math.rst
View File

@ -40,9 +40,6 @@ Number-theoretic and representation functions
*y*. On platforms that support signed zeros, ``copysign(1.0, -0.0)``
returns *-1.0*.
If *x* is NaN, *y* is ignored and NaN is returned. If *y* is NaN,
it is treated as positive: ``copysign(-1.0, NaN)`` returns 1.0.
.. function:: fabs(x)
Return the absolute value of *x*.

4
Modules/mathmodule.c
View File

@ -908,9 +908,7 @@ PyDoc_STRVAR(math_ceil_doc,
FUNC2(copysign, copysign,
"copysign(x, y)\n\nReturn a float with the magnitude (absolute value) "
"of x but the sign \nof y. On platforms that support signed zeros, "
"copysign(1.0, -0.0) \nreturns -1.0.\n\n"
"If x is NaN, y is ignored and NaN is returned. If y is NaN, it is\n"
"treated as positive.")
"copysign(1.0, -0.0) \nreturns -1.0.\n")
FUNC1(cos, cos, 0,
"cos(x)\n\nReturn the cosine of x (measured in radians).")
FUNC1(cosh, cosh, 1,