Skip to content

gh-132457: make staticmethod and classmethod generic #132460

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.

Sign up for GitHub

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 4 commits into from
May 4, 2025
Merged

gh-132457: make staticmethod and classmethod generic #132460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae58b1a
add Py_GenericAlias for staticmethod and classmethod
IvanKirpichnikov Apr 12, 2025
5639738
Add news
IvanKirpichnikov Apr 12, 2025
c32532e
Merge branch 'main' into feature/add_genericalias_for_sm_cm
IvanKirpichnikov May 4, 2025
abf85c6
Merge branch 'main' into feature/add_genericalias_for_sm_cm
sobolevn May 4, 2025
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
4 changes: 3 additions & 1 deletion Lib/test/test_genericalias.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ class BaseTest(unittest.TestCase):
Future, _WorkItem,
Morsel,
DictReader, DictWriter,
array]
array,
staticmethod,
classmethod]
if ctypes is not None:
generic_types.extend((ctypes.Array, ctypes.LibraryLoader, ctypes.py_object))
if ValueProxy is not None:
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2025-04-13-01-50-40.gh-issue-132457.1q-1xz.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make :func:`staticmethod` and :func:`classmethod` generic.
14 changes: 12 additions & 2 deletions Objects/funcobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1484,6 +1484,11 @@ static PyGetSetDef cm_getsetlist[] = {
{NULL} /* Sentinel */
};

static PyMethodDef cm_methodlist[] = {
{"__class_getitem__", Py_GenericAlias, METH_O|METH_CLASS, NULL},
{NULL} /* Sentinel */
};

static PyObject*
cm_repr(PyObject *self)
{
Expand Down Expand Up @@ -1542,7 +1547,7 @@ PyTypeObject PyClassMethod_Type = {
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
0, /* tp_methods */
cm_methodlist, /* tp_methods */
cm_memberlist, /* tp_members */
cm_getsetlist, /* tp_getset */
0, /* tp_base */
Expand Down Expand Up @@ -1716,6 +1721,11 @@ static PyGetSetDef sm_getsetlist[] = {
{NULL} /* Sentinel */
};

static PyMethodDef sm_methodlist[] = {
{"__class_getitem__", Py_GenericAlias, METH_O|METH_CLASS, NULL},
{NULL} /* Sentinel */
};

static PyObject*
sm_repr(PyObject *self)
{
Expand Down Expand Up @@ -1772,7 +1782,7 @@ PyTypeObject PyStaticMethod_Type = {
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
0, /* tp_methods */
sm_methodlist, /* tp_methods */
sm_memberlist, /* tp_members */
sm_getsetlist, /* tp_getset */
0, /* tp_base */
Expand Down
Loading