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

Show file tree
Hide file tree
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
Use a new private sys function instead
  • Loading branch information
@JelleZijlstra
JelleZijlstra committed Jul 23, 2025
commit 6dc0f4804655b57efd7db6637876910335b09d4d
13 changes: 1 addition & 12 deletions Lib/dataclasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,10 +1340,7 @@ def _add_slots(cls, is_frozen, weakref_slot, defined_fields):

# gh-135228: Make sure the original class can be garbage collected.
# Bypass mapping proxy to allow __dict__ to be removed
old_cls_dict = cls.__dict__ | _deproxier
old_cls_dict.pop('__dict__', None)
if "__weakref__" in cls.__dict__:
del cls.__weakref__
sys._clear_type_descriptors(cls)

return newcls

Expand Down Expand Up @@ -1739,11 +1736,3 @@ def _replace(self, /, **changes):
# changes that aren't fields, this will correctly raise a
# TypeError.
return self.__class__(**changes)


# Hack to the get the underlying dict out of a mappingproxy
# Use it with: cls.__dict__ | _deproxier
class _Deproxier:
def __ror__(self, other):
return other
_deproxier = _Deproxier()
13 changes: 12 additions & 1 deletion Python/clinic/sysmodule.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2641,6 +2641,38 @@ sys__baserepl_impl(PyObject *module)
Py_RETURN_NONE;
}

/*[clinic input]
sys._clear_type_descriptors

type: object
Comment thread
JelleZijlstra marked this conversation as resolved.
Outdated
/

Private function for clearing certain descriptors from a type's dictionary.

See gh-135228 for context.
[clinic start generated code]*/

static PyObject *
sys__clear_type_descriptors(PyObject *module, PyObject *type)
/*[clinic end generated code: output=7d5cefcf861909e0 input=5fdc23500d477de6]*/
{
if (!PyType_Check(type)) {
PyErr_SetString(PyExc_TypeError, "argument must be a type");
return NULL;
}
PyTypeObject *typeobj = (PyTypeObject *)(type);
Comment thread
JelleZijlstra marked this conversation as resolved.
Outdated
PyObject *dict = _PyType_GetDict(typeobj);
if (PyDict_PopString(dict, "__dict__", NULL) < 0) {
return NULL;
}
if (PyDict_PopString(dict, "__weakref__", NULL) < 0) {
return NULL;
}
PyType_Modified(typeobj);
Comment thread
JelleZijlstra marked this conversation as resolved.
Py_RETURN_NONE;
}


/*[clinic input]
sys._is_gil_enabled -> bool

Expand Down Expand Up @@ -2837,6 +2869,7 @@ static PyMethodDef sys_methods[] = {
SYS__STATS_DUMP_METHODDEF
#endif
SYS__GET_CPU_COUNT_CONFIG_METHODDEF
SYS__CLEAR_TYPE_DESCRIPTORS_METHODDEF
SYS__IS_GIL_ENABLED_METHODDEF
SYS__DUMP_TRACELETS_METHODDEF
{NULL, NULL} // sentinel
Expand Down