diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2021-09-12 10:27:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-12 10:27:50 (GMT) |
| commit | 92bf8691fb78f3484bf2daba836c416efedb1d8d (patch) | |
| tree | f5e605dbb607ec58daa687300a5f59f99dd1aee4 /Python | |
| parent | 5277ffe12d492939544ff9c54a3aaf448b913fb3 (diff) | |
| download | cpython-92bf8691fb78f3484bf2daba836c416efedb1d8d.zip cpython-92bf8691fb78f3484bf2daba836c416efedb1d8d.tar.gz cpython-92bf8691fb78f3484bf2daba836c416efedb1d8d.tar.bz2 | |
bpo-43413: Fix handling keyword arguments in subclasses of some buitin classes (GH-26456)
* Constructors of subclasses of some buitin classes (e.g. tuple, list,
frozenset) no longer accept arbitrary keyword arguments.
* Subclass of set can now define a __new__() method with additional
keyword parameters without overriding also __init__().
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/bltinmodule.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 7354183..76c9f87 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -507,7 +507,8 @@ filter_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PyObject *it; filterobject *lz; - if (type == &PyFilter_Type && !_PyArg_NoKeywords("filter", kwds)) + if ((type == &PyFilter_Type || type->tp_init == PyFilter_Type.tp_init) && + !_PyArg_NoKeywords("filter", kwds)) return NULL; if (!PyArg_UnpackTuple(args, "filter", 2, 2, &func, &seq)) @@ -1218,7 +1219,8 @@ map_new(PyTypeObject *type, PyObject *args, PyObject *kwds) mapobject *lz; Py_ssize_t numargs, i; - if (type == &PyMap_Type && !_PyArg_NoKeywords("map", kwds)) + if ((type == &PyMap_Type || type->tp_init == PyMap_Type.tp_init) && + !_PyArg_NoKeywords("map", kwds)) return NULL; numargs = PyTuple_Size(args); |