diff options
| author | Andrew Kuchling <amk@amk.ca> | 2014-02-16 16:15:13 (GMT) |
|---|---|---|
| committer | Andrew Kuchling <amk@amk.ca> | 2014-02-16 16:15:13 (GMT) |
| commit | 87a113b807b308215957f127f3696dca58c08253 (patch) | |
| tree | 92924718e574cae7d5dfac8f8fcff0cd7ee0dcd3 /Modules | |
| parent | f7b2f36f747179cf3dc7a889064f8979e3ad4dae (diff) | |
| parent | 8cb1ec3274fff35a3613dd9fa8f0c99b4f472119 (diff) | |
| download | cpython-87a113b807b308215957f127f3696dca58c08253.zip cpython-87a113b807b308215957f127f3696dca58c08253.tar.gz cpython-87a113b807b308215957f127f3696dca58c08253.tar.bz2 | |
Merge from 3.3
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/mathmodule.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c index 4b3e642..00e2612 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -906,7 +906,11 @@ PyDoc_STRVAR(math_ceil_doc, "This is the smallest integral value >= x."); FUNC2(copysign, copysign, - "copysign(x, y)\n\nReturn x with the sign of y.") + "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.") FUNC1(cos, cos, 0, "cos(x)\n\nReturn the cosine of x (measured in radians).") FUNC1(cosh, cosh, 1, |