Quick fix for test_math failures on Solaris 10 buildbot. For future

reference, note that that asin(float('inf')) doesn't seem to return the
expected NaN on this platform.

diff --git a/Lib/test/ieee754.txt b/Lib/test/ieee754.txt
index a07906cf4b7322094a0477478018d570b18d7de0..5a41c8fe5077a7460752c809662e098dfeada50b 100644 (file)
--- a/Lib/test/ieee754.txt
+++ b/Lib/test/ieee754.txt
@@ -127,31 +127,31 @@ Trigonometric Functions
 >>> sin(INF)
 Traceback (most recent call last):
 ...
-ValueError: math domain error (invalid argument)
+ValueError: math domain error
 >>> sin(NINF)
 Traceback (most recent call last):
 ...
-ValueError: math domain error (invalid argument)
+ValueError: math domain error
 >>> sin(NAN)
 nan
 >>> cos(INF)
 Traceback (most recent call last):
 ...
-ValueError: math domain error (invalid argument)
+ValueError: math domain error
 >>> cos(NINF)
 Traceback (most recent call last):
 ...
-ValueError: math domain error (invalid argument)
+ValueError: math domain error
 >>> cos(NAN)
 nan
 >>> tan(INF)
 Traceback (most recent call last):
 ...
-ValueError: math domain error (invalid argument)
+ValueError: math domain error
 >>> tan(NINF)
 Traceback (most recent call last):
 ...
-ValueError: math domain error (invalid argument)
+ValueError: math domain error
 >>> tan(NAN)
 nan
 
@@ -169,11 +169,11 @@ True
 >>> asin(INF), asin(NINF)
 Traceback (most recent call last):
 ...
-ValueError: math domain error (invalid argument)
+ValueError: math domain error
 >>> acos(INF), acos(NINF)
 Traceback (most recent call last):
 ...
-ValueError: math domain error (invalid argument)
+ValueError: math domain error
 >>> equal(atan(INF), PI/2), equal(atan(NINF), -PI/2)
 (True, True)
 

diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
index 4c820c584881bd5313103fab72fa14e06aecd43c..c57b77a8f63c7398315eeddbb837dcc5923baa6b 100644 (file)
--- a/Modules/mathmodule.c
+++ b/Modules/mathmodule.c
@@ -181,16 +181,16 @@ math_1_to_whatever(PyObject *arg, double (*func) (double),
        PyFPE_END_PROTECT(r);
        if (Py_IS_NAN(r) && !Py_IS_NAN(x)) {
                PyErr_SetString(PyExc_ValueError,
-                               "math domain error (invalid argument)");
+                               "math domain error"); /* invalid arg */
                return NULL;
        }
        if (Py_IS_INFINITY(r) && Py_IS_FINITE(x)) {
                        if (can_overflow)
                                PyErr_SetString(PyExc_OverflowError,
-                                       "math range error (overflow)");
+                                       "math range error"); /* overflow */
                        else
                                PyErr_SetString(PyExc_ValueError,
-                                       "math domain error (singularity)");
+                                       "math domain error"); /* singularity */
                        return NULL;
        }
        if (Py_IS_FINITE(r) && errno && is_error(r))