Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
use list instead of set
  • Loading branch information
sebastien-rosset committed Apr 15, 2020
commit de4432412a8be75d3fe205d2c5280f06acc3fe01
Original file line number Diff line number Diff line change
Expand Up @@ -41,27 +41,25 @@
if self._path_to_item:
path_to_item.extend(self._path_to_item)
path_to_item.append(name)
values = set()
values = []
if model_instances:
for model_instance in model_instances:
if name in model_instance._data_store:
v = model_instance._data_store[name]
if isinstance(v, list):
values.add(tuple(v))
else:
values.add(v)
if v not in values:
values.append(v)
len_values = len(values)
if len_values == 0:
raise ApiKeyError(
"{0} has no key '{1}'".format(type(self).__name__, name),
path_to_item
)
elif len_values == 1:
return list(values)[0]
return values[0]
elif len_values > 1:
raise ApiValueError(
"Values stored for property {0} in {1} difffer when looking "
"Values stored for property {0} in {1} differ when looking "
"at self and self's composed instances. All values must be "
"the same".format(name, type(self).__name__),
path_to_item
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -282,31 +282,30 @@ def __getattr__(self, name):
if self._path_to_item:
path_to_item.extend(self._path_to_item)
path_to_item.append(name)
values = set()
values = []
if model_instances:
for model_instance in model_instances:
if name in model_instance._data_store:
v = model_instance._data_store[name]
if isinstance(v, list):
values.add(tuple(v))
else:
values.add(v)
if v not in values:
values.append(v)
len_values = len(values)
if len_values == 0:
raise ApiKeyError(
"{0} has no key '{1}'".format(type(self).__name__, name),
path_to_item
)
elif len_values == 1:
return list(values)[0]
return values[0]
elif len_values > 1:
raise ApiValueError(
"Values stored for property {0} in {1} difffer when looking "
"Values stored for property {0} in {1} differ when looking "
"at self and self's composed instances. All values must be "
"the same".format(name, type(self).__name__),
path_to_item
)


def to_dict(self):
"""Returns the model properties as a dict"""
return model_to_dict(self, serialize=False)
Expand Down