Skip to content

gh-125916: Allow functools.reduce 'initial' to be a keyword argument #125917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2b57bd0
allow initial as keyword, update docs and news
sayandipdutta Oct 24, 2024
b7617c8
Merge branch 'main' into allow_initial_keyword_reduce
sayandipdutta Oct 24, 2024
47abbd1
Apply suggestions from code review
sayandipdutta Oct 24, 2024
2fc8841
Use Argument Clinic
sayandipdutta Oct 24, 2024
7b795ba
fix functools.reduce signature for pure python
sayandipdutta Oct 24, 2024
11e7d13
initial defaults to _functools._initial_missing
sayandipdutta Oct 24, 2024
25c35e3
update docstring for python version
sayandipdutta Oct 24, 2024
ede87bf
Merge branch 'main' into allow_initial_keyword_reduce
sayandipdutta Oct 24, 2024
d8a5538
Apply suggestions from code review
sayandipdutta Oct 24, 2024
84f0a04
Update Doc/library/functools.rst
sayandipdutta Oct 24, 2024
8b3c2e5
review remove private API usage for PyObject_New
sayandipdutta Oct 24, 2024
2705ffa
inspecting reduce signature unsupported
sayandipdutta Oct 24, 2024
0d81eb2
Update Lib/functools.py
sayandipdutta Oct 25, 2024
46979d0
resolve conflicts
sayandipdutta Nov 1, 2024
7e05bc7
remove _initial_missing
sayandipdutta Nov 1, 2024
f1b5994
Update Misc/NEWS.d/next/Library/2024-10-24-13-40-20.gh-issue-126916.M…
sayandipdutta Nov 1, 2024
7cc052f
update whatsnew entry
sayandipdutta Nov 2, 2024
4130df8
Merge branch 'main' into allow_initial_keyword_reduce
sayandipdutta Nov 2, 2024
b4fb15c
Merge branch 'main' into allow_initial_keyword_reduce
sayandipdutta Nov 11, 2024
0cda3b6
Merge branch 'main' into allow_initial_keyword_reduce
sayandipdutta Nov 12, 2024
85e5012
Merge branch 'main' into allow_initial_keyword_reduce
erlend-aasland Nov 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Doc/library/functools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ The :mod:`functools` module defines the following functions:
.. versionadded:: 3.4


.. function:: reduce(function, iterable[, initial], /)
.. function:: reduce(function, iterable, /[, initial])

Apply *function* of two arguments cumulatively to the items of *iterable*, from
left to right, so as to reduce the iterable to a single value. For example,
Expand All @@ -468,7 +468,7 @@ The :mod:`functools` module defines the following functions:

initial_missing = object()

def reduce(function, iterable, initial=initial_missing, /):
def reduce(function, iterable, /, initial=initial_missing):
it = iter(iterable)
if initial is initial_missing:
value = next(it)
Expand All @@ -480,6 +480,8 @@ The :mod:`functools` module defines the following functions:

See :func:`itertools.accumulate` for an iterator that yields all intermediate
values.
.. versionchanged:: 3.14
*initial* is now supported as a keyword argument.

.. decorator:: singledispatch

Expand Down
4 changes: 2 additions & 2 deletions Lib/functools.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@ def __ge__(self, other):

_initial_missing = object()

def reduce(function, sequence, initial=_initial_missing):
def reduce(function, sequence, /, initial=_initial_missing):
"""
reduce(function, iterable[, initial], /) -> value
reduce(function, iterable, /[, initial]) -> value

Apply a function of two arguments cumulatively to the items of a sequence
or iterable, from left to right, so as to reduce the iterable to a single
Expand Down
23 changes: 23 additions & 0 deletions Lib/test/test_functools.py
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,29 @@ def __getitem__(self, i):
d = {"one": 1, "two": 2, "three": 3}
self.assertEqual(self.reduce(add, d), "".join(d.keys()))

# test correctness of keyword usage of `initial` in `reduce`
def test_initial_keyword(self):
def add(x, y):
return x + y
self.assertEqual(
self.reduce(add, ['a', 'b', 'c'], ''),
self.reduce(add, ['a', 'b', 'c'], initial=''),
)
self.assertEqual(
self.reduce(add, [['a', 'c'], [], ['d', 'w']], []),
self.reduce(add, [['a', 'c'], [], ['d', 'w']], initial=[]),
)
self.assertEqual(
self.reduce(lambda x, y: x*y, range(2,8), 1),
self.reduce(lambda x, y: x*y, range(2,8), initial=1),
)
self.assertEqual(
self.reduce(lambda x, y: x*y, range(2,21), 1),
self.reduce(lambda x, y: x*y, range(2,21), initial=1),
)
self.assertRaises(TypeError, self.reduce, add, [0, 1], initial="")
self.assertEqual(self.reduce(42, "", initial="1"), "1") # func is never called with one item


@unittest.skipUnless(c_functools, 'requires the C _functools module')
class TestReduceC(TestReduce, unittest.TestCase):
Expand Down
1 change: 1 addition & 0 deletions Misc/ACKS
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ Luke Dunstan
Virgil Dupras
Bruno Dupuis
Andy Dustman
Sayandip Dutta
Gary Duzan
Eugene Dvurechenski
Karmen Dykstra
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Allow the *initial* argument of :func:`functools.reduce` to be a keyword.
Patch by Sayandip Dutta.
13 changes: 9 additions & 4 deletions Modules/_functoolsmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -935,12 +935,16 @@
// Not converted to argument clinic, because of `args` in-place modification.
// AC will affect performance.
static PyObject *
functools_reduce(PyObject *self, PyObject *args)
functools_reduce(PyObject *self, PyObject *args, PyObject *kwargs)
{
PyObject *seq, *func, *result = NULL, *it;
static char *keywords[] = {"", "", "initial", NULL};

if (!PyArg_UnpackTuple(args, "reduce", 2, 3, &func, &seq, &result))
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|O:reduce", keywords,
&func, &seq, &result)) {
return NULL;
}

if (result != NULL)
Py_INCREF(result);

Expand Down Expand Up @@ -1007,7 +1011,7 @@
}

PyDoc_STRVAR(functools_reduce_doc,
"reduce(function, iterable[, initial], /) -> value\n\
"reduce(function, iterable, /[, initial]) -> value\n\
\n\
Apply a function of two arguments cumulatively to the items of a sequence\n\
or iterable, from left to right, so as to reduce the iterable to a single\n\
Expand Down Expand Up @@ -1720,7 +1724,8 @@
"Tools that operate on functions.");

static PyMethodDef _functools_methods[] = {
{"reduce", functools_reduce, METH_VARARGS, functools_reduce_doc},
{"reduce", functools_reduce, METH_VARARGS|METH_KEYWORDS,

Check warning on line 1727 in Modules/_functoolsmodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-22.04)

initialization of ‘PyObject * (*)(PyObject *, PyObject *)’ {aka ‘struct _object * (*)(struct _object *, struct _object *)’} from incompatible pointer type ‘PyObject * (*)(PyObject *, PyObject *, PyObject *)’ {aka ‘struct _object * (*)(struct _object *, struct _object *, struct _object *)’} [-Wincompatible-pointer-types]

Check warning on line 1727 in Modules/_functoolsmodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-22.04)

initialization of ‘PyObject * (*)(PyObject *, PyObject *)’ {aka ‘struct _object * (*)(struct _object *, struct _object *)’} from incompatible pointer type ‘PyObject * (*)(PyObject *, PyObject *, PyObject *)’ {aka ‘struct _object * (*)(struct _object *, struct _object *, struct _object *)’} [-Wincompatible-pointer-types]

Check warning on line 1727 in Modules/_functoolsmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build (arm64)

'PyObject *(__cdecl *)(PyObject *,PyObject *,PyObject *)' differs in parameter lists from 'PyCFunction' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check warning on line 1727 in Modules/_functoolsmodule.c

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / build (arm64)

'PyObject *(__cdecl *)(PyObject *,PyObject *,PyObject *)' differs in parameter lists from 'PyCFunction' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check warning on line 1727 in Modules/_functoolsmodule.c

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu

initialization of ‘PyObject * (*)(PyObject *, PyObject *)’ {aka ‘struct _object * (*)(struct _object *, struct _object *)’} from incompatible pointer type ‘PyObject * (*)(PyObject *, PyObject *, PyObject *)’ {aka ‘struct _object * (*)(struct _object *, struct _object *, struct _object *)’} [-Wincompatible-pointer-types]

Check warning on line 1727 in Modules/_functoolsmodule.c

View workflow job for this annotation

GitHub Actions / Address sanitizer

initialization of ‘PyObject * (*)(PyObject *, PyObject *)’ {aka ‘struct _object * (*)(struct _object *, struct _object *)’} from incompatible pointer type ‘PyObject * (*)(PyObject *, PyObject *, PyObject *)’ {aka ‘struct _object * (*)(struct _object *, struct _object *, struct _object *)’} [-Wincompatible-pointer-types]

Check warning on line 1727 in Modules/_functoolsmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build and test (x64)

'PyObject *(__cdecl *)(PyObject *,PyObject *,PyObject *)' differs in parameter lists from 'PyCFunction' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]

Check warning on line 1727 in Modules/_functoolsmodule.c

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / build and test (x64)

'PyObject *(__cdecl *)(PyObject *,PyObject *,PyObject *)' differs in parameter lists from 'PyCFunction' [D:\a\cpython\cpython\PCbuild\pythoncore.vcxproj]
functools_reduce_doc},
_FUNCTOOLS_CMP_TO_KEY_METHODDEF
{NULL, NULL} /* sentinel */
};
Expand Down
Loading