Revert "Simplify math_1, like other functions"

This reverts commit 9c32ae0.
python · hauntsaninja · Sep 3, 2023 · Feb 23, 2023 · Apr 3, 2023 · Apr 8, 2023
commit 796bdca44c9662d27353e7281bd7ecf6a5f9e0e0
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
@@ -962,17 +962,24 @@ math_1(PyObject *arg, double (*func) (double), int can_overflow)
         return NULL;
     errno = 0;
     r = (*func)(x);
-    if (Py_IS_NAN(r) && !Py_IS_NAN(x))
-        errno = EDOM;
+    if (Py_IS_NAN(r) && !Py_IS_NAN(x)) {
+        PyErr_SetString(PyExc_ValueError,
+                        "math domain error"); /* invalid arg */
+        return NULL;
+    }
     if (Py_IS_INFINITY(r) && Py_IS_FINITE(x)) {
         if (can_overflow)
-            errno = ERANGE;
+            PyErr_SetString(PyExc_OverflowError,
+                            "math range error"); /* overflow */
         else
-            errno = EDOM;
+            PyErr_SetString(PyExc_ValueError,
+                            "math domain error"); /* singularity */
+        return NULL;
     }
-    if (errno && is_error(r))
+    if (Py_IS_FINITE(r) && errno && is_error(r))
         /* this branch unnecessary on most platforms */
         return NULL;
+
     return PyFloat_FromDouble(r);
 }