Skip to content

Commit

Permalink
gh-101678: Merge math_1_to_whatever() and math_1() (#101730)
Browse files Browse the repository at this point in the history
`math_1_to_whatever()` is no longer useful, since all existing uses of it convert to `float`.
Earlier versions of Python used `math_1_to_whatever` with an integer target; see
gh-16991 for the PR where that use was removed.
  • Loading branch information
skirpichev authored Feb 9, 2023
1 parent 5839575 commit 45fa12a
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions Modules/mathmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -875,9 +875,7 @@ is_error(double x)
*/

static PyObject *
math_1_to_whatever(PyObject *arg, double (*func) (double),
PyObject *(*from_double_func) (double),
int can_overflow)
math_1(PyObject *arg, double (*func) (double), int can_overflow)
{
double x, r;
x = PyFloat_AsDouble(arg);
Expand All @@ -903,7 +901,7 @@ math_1_to_whatever(PyObject *arg, double (*func) (double),
/* this branch unnecessary on most platforms */
return NULL;

return (*from_double_func)(r);
return PyFloat_FromDouble(r);
}

/* variant of math_1, to be used when the function being wrapped is known to
Expand Down Expand Up @@ -951,12 +949,6 @@ math_1a(PyObject *arg, double (*func) (double))
OverflowError.
*/

static PyObject *
math_1(PyObject *arg, double (*func) (double), int can_overflow)
{
return math_1_to_whatever(arg, func, PyFloat_FromDouble, can_overflow);
}

static PyObject *
math_2(PyObject *const *args, Py_ssize_t nargs,
double (*func) (double, double), const char *funcname)
Expand Down

0 comments on commit 45fa12a

Please sign in to comment.