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

Sun Feb 16 17:15:20 CET 2014

http://hg.python.org/cpython/rev/7d54853d2b72
changeset: 89214:7d54853d2b72
parent: 89212:eef7899ea7ab
parent: 89213:3ad7725b5013
user: Andrew Kuchling <amk at amk.ca>
date: Sun Feb 16 11:15:13 2014 -0500
summary:
 Merge from 3.3
files:
 Doc/library/math.rst | 7 +++++--
 Modules/mathmodule.c | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Doc/library/math.rst b/Doc/library/math.rst
--- a/Doc/library/math.rst
+++ b/Doc/library/math.rst
@@ -36,9 +36,12 @@
 
 .. function:: copysign(x, y)
 
- Return *x* with the sign of *y*. On a platform that supports
- signed zeros, ``copysign(1.0, -0.0)`` returns *-1.0*.
+ Return a float with the magnitude (absolute value) of *x* but the sign of
+ *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)
 
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
--- a/Modules/mathmodule.c
+++ b/Modules/mathmodule.c
@@ -906,7 +906,11 @@
 "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,
-- 
Repository URL: http://hg.python.org/cpython
