Skip to content

gh-145056: Add support for frozendict in dataclass asdict and astuple #145125

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
JelleZijlstra merged 9 commits into from
Apr 23, 2026
Merged

gh-145056: Add support for frozendict in dataclass asdict and astuple #145125

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
d2d5e95
Add support for frozendict in dataclass asdict and astuple
eendebakpt Feb 22, 2026
cc5d549
update documentation
eendebakpt Feb 22, 2026
335cac5
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 22, 2026
f19c46d
fix news entry
eendebakpt Feb 22, 2026
d61d4f5
Merge branch 'main' into dataclasses_frozendict_tests
eendebakpt Feb 22, 2026
719c0f3
fix whatsnew entry
eendebakpt Feb 22, 2026
97cec2d
review comments
eendebakpt Feb 23, 2026
bc112a2
Merge branch 'main' into dataclasses_frozendict_tests
eendebakpt Feb 23, 2026
2fc6f65
Merge branch 'main' into dataclasses_frozendict_tests
eendebakpt Apr 18, 2026
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
Next Next commit
Add support for frozendict in dataclass asdict and astuple
  • Loading branch information
@eendebakpt
eendebakpt committed Feb 22, 2026
commit d2d5e95db290ed90aec504479a91cf8d1e8c6207
4 changes: 2 additions & 2 deletions Lib/dataclasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,7 @@ def _asdict_inner(obj, dict_factory):
return obj_type(*[_asdict_inner(v, dict_factory) for v in obj])
else:
return obj_type(_asdict_inner(v, dict_factory) for v in obj)
elif issubclass(obj_type, dict):
elif issubclass(obj_type, (dict, frozendict)):
if hasattr(obj_type, 'default_factory'):
# obj is a defaultdict, which has a different constructor from
# dict as it requires the default_factory as its first arg.
Expand Down Expand Up @@ -1610,7 +1610,7 @@ def _astuple_inner(obj, tuple_factory):
# generator (which is not true for namedtuples, handled
# above).
return type(obj)(_astuple_inner(v, tuple_factory) for v in obj)
elif isinstance(obj, dict):
elif isinstance(obj, (dict, frozendict)):
obj_type = type(obj)
if hasattr(obj_type, 'default_factory'):
# obj is a defaultdict, which has a different constructor from
Expand Down
20 changes: 17 additions & 3 deletions Lib/test/test_dataclasses/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1693,17 +1693,24 @@ class GroupTuple:
class GroupDict:
id: int
users: Dict[str, User]
@dataclass
class GroupFrozenDict:
id: int
users: frozendict[str, User]
a = User('Alice', 1)
b = User('Bob', 2)
gl = GroupList(0, [a, b])
gt = GroupTuple(0, (a, b))
gd = GroupDict(0, {'first': a, 'second': b})
gfd = GroupFrozenDict(0, frozendict({'first': a, 'second': b}))
self.assertEqual(asdict(gl), {'id': 0, 'users': [{'name': 'Alice', 'id': 1},
{'name': 'Bob', 'id': 2}]})
self.assertEqual(asdict(gt), {'id': 0, 'users': ({'name': 'Alice', 'id': 1},
{'name': 'Bob', 'id': 2})})
self.assertEqual(asdict(gd), {'id': 0, 'users': {'first': {'name': 'Alice', 'id': 1},
'second': {'name': 'Bob', 'id': 2}}})
expected_dict = {'id': 0, 'users': {'first': {'name': 'Alice', 'id': 1},
'second': {'name': 'Bob', 'id': 2}}}
self.assertEqual(asdict(gd), expected_dict)
self.assertEqual(asdict(gfd), expected_dict)

def test_helper_asdict_builtin_object_containers(self):
@dataclass
Expand Down Expand Up @@ -1884,14 +1891,21 @@ class GroupTuple:
class GroupDict:
id: int
users: Dict[str, User]
@dataclass
class GroupFrozenDict:
id: int
users: frozendict[str, User]
a = User('Alice', 1)
b = User('Bob', 2)
gl = GroupList(0, [a, b])
gt = GroupTuple(0, (a, b))
gd = GroupDict(0, {'first': a, 'second': b})
gfd = GroupFrozenDict(0, frozendict({'first': a, 'second': b}))
self.assertEqual(astuple(gl), (0, [('Alice', 1), ('Bob', 2)]))
self.assertEqual(astuple(gt), (0, (('Alice', 1), ('Bob', 2))))
self.assertEqual(astuple(gd), (0, {'first': ('Alice', 1), 'second': ('Bob', 2)}))
d = {'first': ('Alice', 1), 'second': ('Bob', 2)}
self.assertEqual(astuple(gd), (0, d))
self.assertEqual(astuple(gfd), (0, frozendict(d)))

def test_helper_astuple_builtin_object_containers(self):
@dataclass
Expand Down