merge master into improve-health-2

2016-12-10 13:10:19 -05:00
parent 37c86350f2 1b9432824b
commit 5778cb4b51
4 changed files with 52 additions and 6 deletions
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1261,7 +1261,7 @@ class GenericReferenceField(BaseField):
        if document is None:
            return None

-        if isinstance(document, (dict, SON)):
+        if isinstance(document, (dict, SON, ObjectId, DBRef)):
            return document

        id_field_name = document.__class__._meta['id_field']