Fix #864: ComplexDateTimeField should fall back to None when null=True

This commit is contained in:
Jimmy Shen
2015-02-18 10:37:13 -05:00
committed by David Bordeynik
parent baf79dda21
commit ce9d0d7e82
4 changed files with 15 additions and 2 deletions

View File

@@ -510,7 +510,7 @@ class ComplexDateTimeField(StringField):
def __get__(self, instance, owner):
data = super(ComplexDateTimeField, self).__get__(instance, owner)
if data is None:
return datetime.datetime.now()
return None if self.null else datetime.datetime.now()
if isinstance(data, datetime.datetime):
return data
return self._convert_from_string(data)