This commit is contained in:
Ross Lawley 2012-07-30 13:00:42 +01:00
parent 8a046bfa5d
commit 7ca81d6fb8

View File

@ -791,11 +791,11 @@ class BaseDocument(object):
self._data = {} self._data = {}
# Assign default values to instance # Assign default values to instance
for attr_name, field in self._fields.items(): for key, field in self._fields.items():
if self._db_field_map.get(attr_name, attr_name) in values: if self._db_field_map.get(key, key) in values:
continue continue
value = getattr(self, attr_name, None) value = getattr(self, key, None)
setattr(self, attr_name, value) setattr(self, key, value)
# Set passed values after initialisation # Set passed values after initialisation
if self._dynamic: if self._dynamic:
@ -824,8 +824,6 @@ class BaseDocument(object):
signals.post_init.send(self.__class__, document=self) signals.post_init.send(self.__class__, document=self)
def __setattr__(self, name, value): def __setattr__(self, name, value):
if not self._initialised:
return super(BaseDocument, self).__setattr__(name, value)
# Handle dynamic data only if an initialised dynamic document # Handle dynamic data only if an initialised dynamic document
if self._dynamic and not self._dynamic_lock: if self._dynamic and not self._dynamic_lock: