diff options
| author | Andrew Kuchling <amk@amk.ca> | 2014-02-16 17:18:17 (GMT) |
|---|---|---|
| committer | Andrew Kuchling <amk@amk.ca> | 2014-02-16 17:18:17 (GMT) |
| commit | c77974e033aad72f28172dd3db3d24e3f039bb49 (patch) | |
| tree | a26249d257579050950a116e4dd97aac476a33a5 | |
| parent | 87a113b807b308215957f127f3696dca58c08253 (diff) | |
| parent | 3137885c363260e34b47d60a03a5464289ae796c (diff) | |
| download | cpython-c77974e033aad72f28172dd3db3d24e3f039bb49.zip cpython-c77974e033aad72f28172dd3db3d24e3f039bb49.tar.gz cpython-c77974e033aad72f28172dd3db3d24e3f039bb49.tar.bz2 | |
Merge from 3.3
| -rw-r--r-- | Doc/library/math.rst | 3 | ||||
| -rw-r--r-- | Modules/mathmodule.c | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Doc/library/math.rst b/Doc/library/math.rst index 0083409..3c41672 100644 --- a/Doc/library/math.rst +++ b/Doc/library/math.rst @@ -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*. diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c index 00e2612..7f094ff 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -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, |