andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

models: Update copy to only validate new values.

Browse Source
This commit is contained in:
Thomas Adamcik 2015-04-04 16:28:32 +02:00
parent 2d03cd7290
commit f131ba4879
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mopidy/models.py
View File

@ -21,7 +21,7 @@ class Field(object):
:param type: if set the field value must be of this type
:param choices: if set the field value must be one of these
"""
self._name = None # Set by FieldMeta
self._name = None # Set by FieldOwner
self._choices = choices
self._default = default
self._type = type
@ -197,17 +197,14 @@ class ImmutableObject(object):
:type values: dict
:rtype: new instance of the model being copied
"""
data = {}
for key, value in self.__dict__.items():
data[key] = value
for key in values.keys():
if hasattr(self, key):
data[key] = values.pop(key)
if values:
args = ', '.join(values)
raise TypeError(
'copy() got an unexpected keyword argument "%s"' % args)
return self.__class__(**data)
other = self.__class__()
other.__dict__.update(self.__dict__.copy())
for key, value in values.items():
if key not in self._fields:
raise TypeError(
'copy() got an unexpected keyword argument "%s"' % key)
super(ImmutableObject, other).__setattr__(key, value)
return other
def serialize(self):
data = {}