openstack
/
octavia
Code Issues Proposed changes

Merge "Fixing data model to_dict() recursive function"

This commit is contained in:
Zuul 2018-12-28 04:20:42 +00:00 committed by Gerrit Code Review
parent 4669ceeba7 0258cd13a7
commit 186b678308
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octavia/common/data_models.py
View File

@ -44,7 +44,8 @@ class BaseDataModel(object):
if type(self) not in calling_classes:
ret[attr].append(
item.to_dict(calling_classes=(
calling_classes + [type(self)])))
calling_classes + [type(self)]),
recurse=recurse))
else:
ret[attr] = None
else:
@ -52,7 +53,8 @@ class BaseDataModel(object):
elif isinstance(getattr(self, attr), BaseDataModel):
if type(self) not in calling_classes:
ret[attr] = value.to_dict(
calling_classes=calling_classes + [type(self)])
calling_classes=calling_classes + [type(self)],
recurse=recurse)
else:
ret[attr] = None
elif six.PY2 and isinstance(value, six.text_type):