Commitc46a423

authored

bpo-35540 dataclasses.asdict now supports defaultdict fields (gh-32056)

1 parenta4b7794 commitc46a423Copy full SHA for c46a423

File tree

+28

-2

lines changed

+28

-2

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1325,6 +1325,14 @@ def _asdict_inner(obj, dict_factory):`
`1325`	`1325`	`# generator (which is not true for namedtuples, handled`
`1326`	`1326`	`# above).`
`1327`	`1327`	`returntype(obj)(_asdict_inner(v,dict_factory)forvinobj)`
	`1328`	`+elifisinstance(obj,dict)andhasattr(type(obj),'default_factory'):`
	`1329`	`+# obj is a defaultdict, which has a different constructor from`
	`1330`	`+# dict as it requires the default_factory as its first arg.`
	`1331`	`+# https://bugs.python.org/issue35540`
	`1332`	`+result=type(obj)(getattr(obj,'default_factory'))`
	`1333`	`+fork,vinobj.items():`
	`1334`	`+result[_asdict_inner(k,dict_factory)]=_asdict_inner(v,dict_factory)`
	`1335`	`+returnresult`
`1328`	`1336`	`elifisinstance(obj,dict):`
`1329`	`1337`	`returntype(obj)((_asdict_inner(k,dict_factory),`
`1330`	`1338`	`_asdict_inner(v,dict_factory))`

Lines changed: 19 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@`
`12`	`12`	`importweakref`
`13`	`13`	`importunittest`
`14`	`14`	`fromunittest.mockimportMock`
`15`		`-fromtypingimportClassVar,Any,List,Union,Tuple,Dict,Generic,TypeVar,Optional,Protocol`
	`15`	`+fromtypingimportClassVar,Any,List,Union,Tuple,Dict,Generic,TypeVar,Optional,Protocol,DefaultDict`
`16`	`16`	`fromtypingimportget_type_hints`
`17`		`-fromcollectionsimportdeque,OrderedDict,namedtuple`
	`17`	`+fromcollectionsimportdeque,OrderedDict,namedtuple,defaultdict`
`18`	`18`	`fromfunctoolsimporttotal_ordering`
`19`	`19`
`20`	`20`	`importtyping# Needed for the string "typing.ClassVar[int]" to work as an annotation.`
`@@ -1677,6 +1677,23 @@ class C:`
`1677`	`1677`	`self.assertIsNot(d['f'],t)`
`1678`	`1678`	`self.assertEqual(d['f'].my_a(),6)`
`1679`	`1679`
	`1680`	`+deftest_helper_asdict_defaultdict(self):`
	`1681`	`+# Ensure asdict() does not throw exceptions when a`
	`1682`	`+# defaultdict is a member of a dataclass`
	`1683`	`+`
	`1684`	`+@dataclass`
	`1685`	`+classC:`
	`1686`	`+mp:DefaultDict[str,List]`
	`1687`	`+`
	`1688`	`+`
	`1689`	`+dd=defaultdict(list)`
	`1690`	`+dd["x"].append(12)`
	`1691`	`+c=C(mp=dd)`
	`1692`	`+d=asdict(c)`
	`1693`	`+`
	`1694`	`+assertd== {"mp": {"x": [12]}}`
	`1695`	`+assertd["mp"]isnotc.mp# make sure defaultdict is copied`
	`1696`	`+`
`1680`	`1697`	`deftest_helper_astuple(self):`
`1681`	`1698`	`# Basic tests for astuple(), it should return a new tuple.`
`1682`	`1699`	`@dataclass`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix:func:`dataclasses.asdict` crash when:class:`collections.defaultdict` is present in the attributes.

Comments

(0)