Skip to content

gh-132284: Don't wrap base PyCFunction slots on class creation if not overridden #132329

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
iritkatriel merged 9 commits into from
Apr 17, 2025
Merged

gh-132284: Don't wrap base PyCFunction slots on class creation if not overridden #132329

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2067587
don't wrap base PyCFunction slots on class creation if not overridden
tom-pytel Apr 9, 2025
1873d83
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 9, 2025
83652a3
include the actual change
tom-pytel Apr 9, 2025
ef64777
stupid testing
tom-pytel Apr 9, 2025
95976fc
add requested test
tom-pytel Apr 12, 2025
1fe065a
Merge branch 'main' into fix-issue-132284
tom-pytel Apr 15, 2025
b1b9176
add whatsnew entry describing change
tom-pytel Apr 15, 2025
4772fe3
whatsnew tweak
tom-pytel Apr 15, 2025
f7659ea
Merge branch 'main' into fix-issue-132284
iritkatriel Apr 16, 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
Prev Previous commit
Next Next commit
include the actual change
  • Loading branch information
@tom-pytel
tom-pytel committed Apr 9, 2025
commit 83652a3f2855a075769a617bd747a3c6fe5d2950
16 changes: 8 additions & 8 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11183,14 +11183,14 @@ update_one_slot(PyTypeObject *type, pytype_slotdef *p)
}
else {
use_generic = 1;
// if (generic == NULL && Py_IS_TYPE(descr, &PyMethodDescr_Type) &&
// *ptr == ((PyMethodDescrObject *)descr)->d_method->ml_meth)
// {
// generic = *ptr;
// }
// else {
// generic = p->function;
// }
if (generic == NULL && Py_IS_TYPE(descr, &PyMethodDescr_Type) &&
*ptr == ((PyMethodDescrObject *)descr)->d_method->ml_meth)
{
generic = *ptr;
}
else {
generic = p->function;
}
generic = p->function;
if (p->function == slot_tp_call) {
/* A generic __call__ is incompatible with vectorcall */
Expand Down