[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3

Sun Feb 16 18:18:29 CET 2014

http://hg.python.org/cpython/rev/635470340cf3
changeset: 89216:635470340cf3
parent: 89214:7d54853d2b72
parent: 89215:b01f4ed077fa
user: Andrew Kuchling <amk at amk.ca>
date: Sun Feb 16 12:18:17 2014 -0500
summary:
 Merge from 3.3
files:
 Doc/library/math.rst | 3 ---
 Modules/mathmodule.c | 4 +---
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/Doc/library/math.rst b/Doc/library/math.rst
--- a/Doc/library/math.rst
+++ b/Doc/library/math.rst
@@ -40,9 +40,6 @@
 *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
--- a/Modules/mathmodule.c
+++ b/Modules/mathmodule.c
@@ -908,9 +908,7 @@
 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,
-- 
Repository URL: http://hg.python.org/cpython
