summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAndrew Kuchling <amk@amk.ca>2014-02-16 17:18:17 (GMT)
committerAndrew Kuchling <amk@amk.ca>2014-02-16 17:18:17 (GMT)
commitc77974e033aad72f28172dd3db3d24e3f039bb49 (patch)
treea26249d257579050950a116e4dd97aac476a33a5 /Modules
parent87a113b807b308215957f127f3696dca58c08253 (diff)
parent3137885c363260e34b47d60a03a5464289ae796c (diff)
downloadcpython-c77974e033aad72f28172dd3db3d24e3f039bb49.zip
cpython-c77974e033aad72f28172dd3db3d24e3f039bb49.tar.gz
cpython-c77974e033aad72f28172dd3db3d24e3f039bb49.tar.bz2
Merge from 3.3
Diffstat (limited to 'Modules')
-rw-r--r--Modules/mathmodule.c4
1 files changed, 1 insertions, 3 deletions
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,