Skip to content
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.

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

Feature/recursive asdict #395

Merged
merged 5 commits into from
Jun 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelog.d/395.change.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
``attr.asdict()`` now properly handles deeply nested lists and dictionaries.
54 changes: 40 additions & 14 deletions src/attr/_funcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,33 +50,28 @@ def asdict(
if recurse is True:
if has(v.__class__):
rv[a.name] = asdict(
v, recurse=True, filter=filter, dict_factory=dict_factory
v, True, filter, dict_factory, retain_collection_types
)
elif isinstance(v, (tuple, list, set)):
cf = v.__class__ if retain_collection_types is True else list
rv[a.name] = cf(
[
asdict(
i,
recurse=True,
filter=filter,
dict_factory=dict_factory,
_asdict_anything(
i, filter, dict_factory, retain_collection_types
)
if has(i.__class__)
else i
for i in v
]
)
elif isinstance(v, dict):
df = dict_factory
rv[a.name] = df(
(
asdict(kk, dict_factory=df)
if has(kk.__class__)
else kk,
asdict(vv, dict_factory=df)
if has(vv.__class__)
else vv,
_asdict_anything(
kk, filter, df, retain_collection_types
),
_asdict_anything(
vv, filter, df, retain_collection_types
),
)
for kk, vv in iteritems(v)
)
Expand All @@ -87,6 +82,37 @@ def asdict(
return rv


def _asdict_anything(val, filter, dict_factory, retain_collection_types):
"""
``asdict`` only works on attrs instances, this works on anything.
"""
if getattr(val.__class__, "__attrs_attrs__", None) is not None:
# Attrs class.
rv = asdict(val, True, filter, dict_factory, retain_collection_types)
elif isinstance(val, (tuple, list, set)):
cf = val.__class__ if retain_collection_types is True else list
rv = cf(
[
_asdict_anything(
i, filter, dict_factory, retain_collection_types
)
for i in val
]
)
elif isinstance(val, dict):
df = dict_factory
rv = df(
(
_asdict_anything(kk, filter, df, retain_collection_types),
_asdict_anything(vv, filter, df, retain_collection_types),
)
for kk, vv in iteritems(val)
)
else:
rv = val
return rv


def astuple(
inst,
recurse=True,
Expand Down
18 changes: 18 additions & 0 deletions tests/test_funcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,24 @@ def test_recurse(self, C, dict_class):
C(C(1, 2), C(3, 4)), dict_factory=dict_class
)

def test_nested_lists(self, C):
"""
Test unstructuring deeply nested lists.
"""
inner = C(1, 2)
outer = C([[inner]], None)

assert {"x": [[{"x": 1, "y": 2}]], "y": None} == asdict(outer)

def test_nested_dicts(self, C):
"""
Test unstructuring deeply nested dictionaries.
"""
inner = C(1, 2)
outer = C({1: {2: inner}}, None)

assert {"x": {1: {2: {"x": 1, "y": 2}}}, "y": None} == asdict(outer)

@given(nested_classes, st.sampled_from(MAPPING_TYPES))
@settings(suppress_health_check=[HealthCheck.too_slow])
def test_recurse_property(self, cls, dict_class):
Expand Down