Skip to content

gh-135228: When @dataclass(slots=True) replaces a dataclass, make the original class collectible (take 2) #137047

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
encukou merged 9 commits into from
Aug 12, 2025
Merged

gh-135228: When @dataclass(slots=True) replaces a dataclass, make the original class collectible (take 2) #137047

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
916ce1b
gh-135228: When @dataclass(slots=True) replaces a dataclass, make the…
JelleZijlstra Jul 22, 2025
6dc0f48
Use a new private sys function instead
JelleZijlstra Jul 23, 2025
b9fb155
obsolete comment
JelleZijlstra Jul 23, 2025
52c7d2b
restrict to heap types
JelleZijlstra Jul 23, 2025
250f3e9
more paranoid
JelleZijlstra Jul 25, 2025
a9483b4
Apply suggestions from code review
JelleZijlstra Jul 29, 2025
8c2c1e1
Update Python/sysmodule.c
JelleZijlstra Jul 30, 2025
2d3bd7c
Feedback from Petr
JelleZijlstra Aug 5, 2025
06618d8
use AC for type checking
JelleZijlstra Aug 12, 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
more paranoid
  • Loading branch information
@JelleZijlstra
JelleZijlstra committed Jul 25, 2025
commit 250f3e9935d8188c27dcd91e6cb61293166475c9
13 changes: 11 additions & 2 deletions Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2666,13 +2666,22 @@ sys__clear_type_descriptors(PyObject *module, PyObject *type)
return NULL;
}
PyObject *dict = _PyType_GetDict(typeobj);
if (PyDict_PopString(dict, "__dict__", NULL) < 0) {
PyObject *dunder_dict = NULL;
if (PyDict_PopString(dict, "__dict__", &dunder_dict) < 0) {
Comment thread
JelleZijlstra marked this conversation as resolved.
Outdated
return NULL;
}
if (PyDict_PopString(dict, "__weakref__", NULL) < 0) {
PyObject *dunder_weakref = NULL;
if (PyDict_PopString(dict, "__weakref__", &dunder_weakref) < 0) {
Comment thread
JelleZijlstra marked this conversation as resolved.
Outdated
PyType_Modified(typeobj);
Py_XDECREF(dunder_dict);
return NULL;
}
PyType_Modified(typeobj);
Comment thread
JelleZijlstra marked this conversation as resolved.
// We try to hold onto a reference to these until after we call
// PyType_Modified(), in case their deallocation triggers somer user code
// that tries to do something to the type.
Py_XDECREF(dunder_dict);
Py_XDECREF(dunder_weakref);
Py_RETURN_NONE;
}

Expand Down