Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork34k
gh-144330: Initialize classmethod and staticmethod in new#144469
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
vstinner wants to merge2 commits intopython:mainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
+116 −55
Open
Changes fromall commits
Commits
Show all changes
2 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
32 changes: 14 additions & 18 deletionsLib/test/test_descr.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletionsMisc/NEWS.d/next/Core_and_Builtins/2026-02-04-11-19-45.gh-issue-144330.kOowSb.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| Move ``classmethod`` and ``staticmethod`` initialization from ``__init__()`` | ||
| to ``__new__()``. Patch by Victor Stinner. |
130 changes: 95 additions & 35 deletionsObjects/funcobject.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1466,33 +1466,59 @@ static PyObject * | ||
| cm_descr_get(PyObject *self, PyObject *obj, PyObject *type) | ||
| { | ||
| classmethod *cm = (classmethod *)self; | ||
sergey-miryanov marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| if (type == NULL) | ||
| type = (PyObject *)(Py_TYPE(obj)); | ||
| return PyMethod_New(cm->cm_callable, type); | ||
| } | ||
| static int | ||
| cm_set_callable(classmethod *cm, PyObject *callable) | ||
| { | ||
| assert(callable != NULL); | ||
| if (cm->cm_callable == callable) { | ||
| // cm_init() sets the same callable than cm_new() | ||
| return 0; | ||
| } | ||
| Py_XSETREF(cm->cm_callable, Py_NewRef(callable)); | ||
| return functools_wraps((PyObject *)cm, cm->cm_callable); | ||
| } | ||
| static PyObject * | ||
| cm_new(PyTypeObject *type, PyObject *args, PyObject *kwds) | ||
| { | ||
| if (!_PyArg_NoKeywords("classmethod", kwds)) { | ||
| return NULL; | ||
| } | ||
| PyObject *callable; // borrowed ref | ||
| if (!PyArg_UnpackTuple(args, "classmethod", 1, 1, &callable)) { | ||
| return NULL; | ||
| } | ||
| classmethod *cm = (classmethod *)PyType_GenericAlloc(type, 0); | ||
| if (cm == NULL) { | ||
| return NULL; | ||
| } | ||
| if (cm_set_callable(cm, callable) < 0) { | ||
| Py_DECREF(cm); | ||
| return NULL; | ||
| } | ||
| return (PyObject *)cm; | ||
| } | ||
| static int | ||
| cm_init(PyObject *self, PyObject *args, PyObject *kwds) | ||
| { | ||
| if (!_PyArg_NoKeywords("classmethod", kwds)) { | ||
| return -1; | ||
| } | ||
| PyObject *callable; // borrowed ref | ||
| if (!PyArg_UnpackTuple(args, "classmethod", 1, 1, &callable)) { | ||
| return -1; | ||
| } | ||
| classmethod *cm = (classmethod *)self; | ||
| return cm_set_callable(cm, callable); | ||
| } | ||
| static PyMemberDef cm_memberlist[] = { | ||
| @@ -1623,7 +1649,7 @@ PyTypeObject PyClassMethod_Type = { | ||
| offsetof(classmethod, cm_dict), /* tp_dictoffset */ | ||
| cm_init, /* tp_init */ | ||
| PyType_GenericAlloc, /* tp_alloc */ | ||
| cm_new, /* tp_new */ | ||
| PyObject_GC_Del, /* tp_free */ | ||
| }; | ||
| @@ -1632,8 +1658,12 @@ PyClassMethod_New(PyObject *callable) | ||
| { | ||
| classmethod *cm = (classmethod *) | ||
| PyType_GenericAlloc(&PyClassMethod_Type, 0); | ||
| if (cm == NULL) { | ||
| return NULL; | ||
| } | ||
| if (cm_set_callable(cm, callable) < 0) { | ||
| Py_DECREF(cm); | ||
| return NULL; | ||
| } | ||
| return (PyObject *)cm; | ||
| } | ||
| @@ -1699,31 +1729,57 @@ static PyObject * | ||
| sm_descr_get(PyObject *self, PyObject *obj, PyObject *type) | ||
| { | ||
| staticmethod *sm = (staticmethod *)self; | ||
| return Py_NewRef(sm->sm_callable); | ||
| } | ||
sergey-miryanov marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| static int | ||
| sm_set_callable(staticmethod *sm, PyObject *callable) | ||
| { | ||
| assert(callable != NULL); | ||
| if (sm->sm_callable == callable) { | ||
| // sm_init() sets the same callable than sm_new() | ||
| return 0; | ||
| } | ||
| Py_XSETREF(sm->sm_callable, Py_NewRef(callable)); | ||
| return functools_wraps((PyObject *)sm, sm->sm_callable); | ||
| } | ||
| static PyObject * | ||
| sm_new(PyTypeObject *type, PyObject *args, PyObject *kwds) | ||
| { | ||
| if (!_PyArg_NoKeywords("staticmethod", kwds)) { | ||
| return NULL; | ||
| } | ||
| PyObject *callable; // borrowed ref | ||
| if (!PyArg_UnpackTuple(args, "staticmethod", 1, 1, &callable)) { | ||
| return NULL; | ||
| } | ||
| staticmethod *sm = (staticmethod *)PyType_GenericAlloc(type, 0); | ||
| if (sm == NULL) { | ||
| return NULL; | ||
| } | ||
| if (sm_set_callable(sm, callable) < 0) { | ||
| Py_DECREF(sm); | ||
| return NULL; | ||
| } | ||
| return (PyObject *)sm; | ||
| } | ||
| static int | ||
| sm_init(PyObject *self, PyObject *args, PyObject *kwds) | ||
| { | ||
| if (!_PyArg_NoKeywords("staticmethod", kwds)) { | ||
| return -1; | ||
| } | ||
| PyObject *callable; // borrowed ref | ||
| if (!PyArg_UnpackTuple(args, "staticmethod", 1, 1, &callable)) { | ||
| return -1; | ||
| } | ||
| staticmethod *sm = (staticmethod *)self; | ||
| return sm_set_callable(sm, callable); | ||
| } | ||
| static PyObject* | ||
| @@ -1858,7 +1914,7 @@ PyTypeObject PyStaticMethod_Type = { | ||
| offsetof(staticmethod, sm_dict), /* tp_dictoffset */ | ||
| sm_init, /* tp_init */ | ||
| PyType_GenericAlloc, /* tp_alloc */ | ||
| sm_new, /* tp_new */ | ||
| PyObject_GC_Del, /* tp_free */ | ||
| }; | ||
| @@ -1867,8 +1923,12 @@ PyStaticMethod_New(PyObject *callable) | ||
| { | ||
| staticmethod *sm = (staticmethod *) | ||
| PyType_GenericAlloc(&PyStaticMethod_Type, 0); | ||
| if (sm == NULL) { | ||
| return NULL; | ||
| } | ||
| if (sm_set_callable(sm, callable) < 0) { | ||
| Py_DECREF(sm); | ||
| return NULL; | ||
| } | ||
| return (PyObject *)sm; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.