Merge branch 'master' of github.com:MongoEngine/mongoengine into DonQueso89-master

2020-04-26 22:27:11 +02:00
parent dc1cf88ca6 f5f8b730b5
commit 226049f66a
26 changed files with 122 additions and 66 deletions
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -677,7 +677,10 @@ class ComplexDateTimeField(StringField):
        super().__set__(instance, value)
        value = instance._data[self.name]
        if value is not None:
-            instance._data[self.name] = self._convert_from_datetime(value)
+            if isinstance(value, datetime.datetime):
+                instance._data[self.name] = self._convert_from_datetime(value)
+            else:
+                instance._data[self.name] = value

    def validate(self, value):
        value = self.to_python(value)