gh-144330: Initialize staticmethod/classmethod callables in tp_new #144364
+49
−4
Conversation
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
Member
|
You need to update your branch to fix the CI, it is currently incompatible. |
vstinner
reviewed
Feb 3, 2026
| cm->cm_callable = Py_NewRef(Py_None); | ||
| cm->cm_dict = NULL; | ||
| return (PyObject *)cm; | ||
| } |
Member
There was a problem hiding this comment.
Move cm_new() before PyClassMethod_Type, so you don't need to declare it in advance (remove forward declaration line 1558).
| sm->sm_callable = Py_NewRef(Py_None); | ||
| sm->sm_dict = NULL; | ||
| return (PyObject *)sm; | ||
| } |
Member
There was a problem hiding this comment.
Move sm_new() before PyStaticMethod_Type.
| classmethod *cm = (classmethod *)PyType_GenericAlloc(type, 0); | ||
| if (cm == NULL) | ||
| return NULL; | ||
| cm->cm_callable = Py_NewRef(Py_None); |
Member
There was a problem hiding this comment.
None is immortal so you can just write:
Suggested change
| cm->cm_callable = Py_NewRef(Py_None); | |
| cm->cm_callable = Py_None; |
Same remark in sm_new().
Comment on lines
+1649
to
+1650
| if (cm == NULL) | ||
| return NULL; |
Member
There was a problem hiding this comment.
PEP 7 coding style:
Suggested change
| if (cm == NULL) | |
| return NULL; | |
| if (cm == NULL) { | |
| return NULL; | |
| } |
Same remark in sm_new().
| sm.__init__(None) | ||
| self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10) | ||
|
|
||
| def test_staticmethod_new_none_repr(self): |
Member
There was a problem hiding this comment.
Suggested change
| def test_staticmethod_new_none_repr(self): | |
| def test_staticmethod_new(self): |
|
|
||
| def test_staticmethod_new_none_repr(self): | ||
| sm = staticmethod.__new__(staticmethod, None) | ||
| self.assertIsInstance(repr(sm), str) |
Member
There was a problem hiding this comment.
Suggested change
| self.assertIsInstance(repr(sm), str) | |
| self.assertEqual(repr(sm), '<staticmethod(None)>') |
|
|
||
| def test_classmethod_new_none_repr(self): | ||
| cm = classmethod.__new__(classmethod, None) | ||
| self.assertIsInstance(repr(cm), str) |
Member
There was a problem hiding this comment.
Suggested change
| self.assertIsInstance(repr(cm), str) | |
| self.assertEqual(repr(cm), '<classmethod(None)>') |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
#144330