From bbae869b11b84c1deeaf5e850204710af4ce1b2f Mon Sep 17 00:00:00 2001 From: Sergey B Kirpichev Date: Sat, 9 May 2026 06:29:47 +0300 Subject: [PATCH 1/2] gh-149536: use sentinel to fix _functools.reduce() signature --- Lib/inspect.py | 3 ++- Lib/test/test_inspect/test_inspect.py | 3 +-- Modules/_functoolsmodule.c | 10 ++++++++-- Modules/clinic/_functoolsmodule.c.h | 5 +++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py index a96b3dc954ef0c..dc5a6e3be883bb 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -2200,7 +2200,8 @@ def wrap_value(s): except NameError: raise ValueError - if isinstance(value, (str, int, float, bytes, bool, type(None))): + if isinstance(value, (str, int, float, bytes, bool, type(None), + sentinel)): return ast.Constant(value) raise ValueError diff --git a/Lib/test/test_inspect/test_inspect.py b/Lib/test/test_inspect/test_inspect.py index 9028d42c617fb4..7351f97fd9a4b5 100644 --- a/Lib/test/test_inspect/test_inspect.py +++ b/Lib/test/test_inspect/test_inspect.py @@ -6255,8 +6255,7 @@ def test_faulthandler_module_has_signatures(self): self._test_module_has_signatures(faulthandler, unsupported_signature=unsupported_signature) def test_functools_module_has_signatures(self): - unsupported_signature = {"reduce"} - self._test_module_has_signatures(functools, unsupported_signature=unsupported_signature) + self._test_module_has_signatures(functools) def test_gc_module_has_signatures(self): import gc diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c index 19bdf3d47c2fad..d6da3199a76997 100644 --- a/Modules/_functoolsmodule.c +++ b/Modules/_functoolsmodule.c @@ -9,6 +9,7 @@ #include "pycore_tuple.h" // _PyTuple_ITEMS() #include "pycore_weakref.h" // FT_CLEAR_WEAKREFS() +static PyObject *_initial_missing; #include "clinic/_functoolsmodule.c.h" /*[clinic input] @@ -1066,7 +1067,7 @@ _functools.reduce function as func: object iterable as seq: object / - initial as result: object = NULL + initial as result: object(c_default="NULL") = _functools._initial_missing Apply a function of two arguments cumulatively to the items of an iterable, from left to right. @@ -1081,7 +1082,7 @@ calculates ((((1 + 2) + 3) + 4) + 5). static PyObject * _functools_reduce_impl(PyObject *module, PyObject *func, PyObject *seq, PyObject *result) -/*[clinic end generated code: output=30d898fe1267c79d input=4ccfb74548ce5170]*/ +/*[clinic end generated code: output=30d898fe1267c79d input=7e5eaeb4f8a7a78d]*/ { PyObject *args, *it; @@ -1982,6 +1983,11 @@ _functools_exec(PyObject *module) // lru_list_elem is used only in _lru_cache_wrapper. // So we don't expose it in module namespace. + _initial_missing = PySentinel_New("_initial_missing", "_functools"); + if (PyModule_Add(module, "_initial_missing", _initial_missing) < 0) { + Py_XDECREF(_initial_missing); + return -1; + } return 0; } diff --git a/Modules/clinic/_functoolsmodule.c.h b/Modules/clinic/_functoolsmodule.c.h index 23f66631085031..d25cbe49d18418 100644 --- a/Modules/clinic/_functoolsmodule.c.h +++ b/Modules/clinic/_functoolsmodule.c.h @@ -71,7 +71,8 @@ _functools_cmp_to_key(PyObject *module, PyObject *const *args, Py_ssize_t nargs, } PyDoc_STRVAR(_functools_reduce__doc__, -"reduce($module, function, iterable, /, initial=)\n" +"reduce($module, function, iterable, /,\n" +" initial=_functools._initial_missing)\n" "--\n" "\n" "Apply a function of two arguments cumulatively to the items of an iterable, from left to right.\n" @@ -192,4 +193,4 @@ _functools__lru_cache_wrapper_cache_clear(PyObject *self, PyObject *Py_UNUSED(ig return return_value; } -/*[clinic end generated code: output=7f2abc718fcc35d5 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=81bedd8c45c633e3 input=a9049054013a1b77]*/ From cfe84e84fb42defb647e1406fde57708d8d2121b Mon Sep 17 00:00:00 2001 From: Sergey B Kirpichev Date: Sat, 9 May 2026 11:57:42 +0300 Subject: [PATCH 2/2] use sentinel from pure-Python module --- Modules/_functoolsmodule.c | 10 ++-------- Modules/clinic/_functoolsmodule.c.h | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c index d6da3199a76997..c702eecc700ac8 100644 --- a/Modules/_functoolsmodule.c +++ b/Modules/_functoolsmodule.c @@ -9,7 +9,6 @@ #include "pycore_tuple.h" // _PyTuple_ITEMS() #include "pycore_weakref.h" // FT_CLEAR_WEAKREFS() -static PyObject *_initial_missing; #include "clinic/_functoolsmodule.c.h" /*[clinic input] @@ -1067,7 +1066,7 @@ _functools.reduce function as func: object iterable as seq: object / - initial as result: object(c_default="NULL") = _functools._initial_missing + initial as result: object(c_default="NULL") = functools._initial_missing Apply a function of two arguments cumulatively to the items of an iterable, from left to right. @@ -1082,7 +1081,7 @@ calculates ((((1 + 2) + 3) + 4) + 5). static PyObject * _functools_reduce_impl(PyObject *module, PyObject *func, PyObject *seq, PyObject *result) -/*[clinic end generated code: output=30d898fe1267c79d input=7e5eaeb4f8a7a78d]*/ +/*[clinic end generated code: output=30d898fe1267c79d input=5c9088c98ffe2793]*/ { PyObject *args, *it; @@ -1983,11 +1982,6 @@ _functools_exec(PyObject *module) // lru_list_elem is used only in _lru_cache_wrapper. // So we don't expose it in module namespace. - _initial_missing = PySentinel_New("_initial_missing", "_functools"); - if (PyModule_Add(module, "_initial_missing", _initial_missing) < 0) { - Py_XDECREF(_initial_missing); - return -1; - } return 0; } diff --git a/Modules/clinic/_functoolsmodule.c.h b/Modules/clinic/_functoolsmodule.c.h index d25cbe49d18418..87cdef2ad3cff3 100644 --- a/Modules/clinic/_functoolsmodule.c.h +++ b/Modules/clinic/_functoolsmodule.c.h @@ -72,7 +72,7 @@ _functools_cmp_to_key(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyDoc_STRVAR(_functools_reduce__doc__, "reduce($module, function, iterable, /,\n" -" initial=_functools._initial_missing)\n" +" initial=functools._initial_missing)\n" "--\n" "\n" "Apply a function of two arguments cumulatively to the items of an iterable, from left to right.\n" @@ -193,4 +193,4 @@ _functools__lru_cache_wrapper_cache_clear(PyObject *self, PyObject *Py_UNUSED(ig return return_value; } -/*[clinic end generated code: output=81bedd8c45c633e3 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=ac9e26d0a5a23d40 input=a9049054013a1b77]*/